controller changes

Author: Harsh-Srivastav123

src/main/java/com/example/quizapp/QuizApp/Services/SessionService.java

@@ -216,3 +216,6 @@ public void deleteSession(int sessionId) {
         sessionDAO.deleteById(sessionId);
     }
 }
+
+
+

src/main/java/com/example/quizapp/QuizApp/controller/SessionController.java

@@ -1,11 +1,13 @@
 package com.example.quizapp.QuizApp.controller;
 
 import com.example.quizapp.QuizApp.Services.SessionService;
+import com.example.quizapp.QuizApp.Services.UserService;
 import com.example.quizapp.QuizApp.entity.Session;
 import com.example.quizapp.QuizApp.model.Response;
 import com.example.quizapp.QuizApp.model.SessionDTO;
 import com.example.quizapp.QuizApp.model.SessionResponse;
 import com.example.quizapp.QuizApp.model.SessionResult;
+import com.example.quizapp.QuizApp.security.JwtAuthenticationFilter;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.relational.core.sql.In;
 import org.springframework.http.HttpStatus;
@@ -21,10 +23,15 @@ public class SessionController {
     @Autowired
     SessionService sessionService;
     public record Message(String sessionId,String message){}
+    @Autowired
+    UserService userService;
 
+    @Autowired
+    JwtAuthenticationFilter jwtAuthenticationFilter;
 
     @PostMapping("/createSession")
     public ResponseEntity<Message> createSession(@RequestBody SessionDTO session){
+        session.setUserId(userService.getUserByUserName(jwtAuthenticationFilter.getUserNameByToken()).getId());
         SessionDTO session1=sessionService.createSession(session);
         if(session1!=null){
             return new ResponseEntity<>(new Message(session1.getSessionId().toString(),"Session Created Successfully"), HttpStatus.OK);
@@ -39,6 +46,7 @@ public List<SessionDTO> sessionList(@RequestParam(value = "sessionId",defaultVal
 
     @PostMapping("/sessionResponse")
     public ResponseEntity<SessionResult> submitResponse(@RequestBody SessionResponse sessionResponse){
+        sessionResponse.setUserId(userService.getUserByUserName(jwtAuthenticationFilter.getUserNameByToken()).getId());
         SessionResult sessionResult=sessionService.submitResponse(sessionResponse);
         if(sessionResult!=null){
             return new ResponseEntity<>(sessionResult,HttpStatus.OK);

src/main/java/com/example/quizapp/QuizApp/controller/UserController.java

@@ -6,6 +6,7 @@
 
 import com.example.quizapp.QuizApp.events.RegistrationCompleteEvent;
 import com.example.quizapp.QuizApp.model.*;
+import com.example.quizapp.QuizApp.security.JwtAuthenticationFilter;
 import com.example.quizapp.QuizApp.security.JwtHelper;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -44,17 +45,20 @@ public class UserController {
 
     @Autowired
     private AuthenticationManager manager;
+
+
+    @Autowired
+    JwtAuthenticationFilter jwtAuthenticationFilter;
     @Autowired
     private JwtHelper helper;
     public record Message(String userId,String message){}
     @Autowired
     CloudinaryService cloudinaryService;
     @PostMapping("/response")
-    public Result evaluateQuiz(@RequestBody QuizResponse quizResponse){
-        if(quizResponse==null){
-            return null;
-        }
-        return userService.evaluateQuiz(quizResponse);
+    public ResponseEntity<Result> evaluateQuiz(@RequestBody QuizResponse quizResponse){
+
+        quizResponse.setUserId(userService.getUserByUserName(jwtAuthenticationFilter.getUserNameByToken()).getId());
+        return new ResponseEntity<>(userService.evaluateQuiz(quizResponse),HttpStatus.OK);
     }
     @GetMapping("/user/{id}")
     public UserDTO getUser(@PathVariable Integer id){

src/main/java/com/example/quizapp/QuizApp/exceptions/GlobalExceptionHandler.java

@@ -27,7 +27,7 @@ public ResponseEntity<ErrorMessage> customException(CustomException exception,
     @ExceptionHandler(BadRequest.class)
     public ResponseEntity<ErrorMessage> badRequest(BadRequest exception,
                                                                     WebRequest request) {
-        ErrorMessage message = new ErrorMessage(HttpStatus.NOT_FOUND,
+        ErrorMessage message = new ErrorMessage(HttpStatus.BAD_REQUEST,
                 exception.getMessage());
 
         return ResponseEntity.status(HttpStatus.BAD_REQUEST)

src/main/java/com/example/quizapp/QuizApp/model/QuizResponse.java

@@ -1,5 +1,6 @@
 package com.example.quizapp.QuizApp.model;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -15,6 +16,7 @@ public class QuizResponse {
     List<Response> responseList;
     int totalQuestion;
     String category;
+    @JsonIgnore
     Integer userId;
 
 }

src/main/java/com/example/quizapp/QuizApp/model/SessionDTO.java

@@ -1,6 +1,7 @@
 package com.example.quizapp.QuizApp.model;
 
 import com.example.quizapp.QuizApp.entity.SessionUser;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
 import java.util.List;
@@ -10,6 +11,7 @@ public class SessionDTO {
     String dateAndTime;
     Integer delayDuration;
     Integer duration;
+    @JsonProperty(access = JsonProperty.Access.READ_ONLY)
     Integer userId;
     String sessionTitle;
     List<QuestionDTO> sessionQuestionList;

src/main/java/com/example/quizapp/QuizApp/model/SessionResponse.java

@@ -1,12 +1,14 @@
 package com.example.quizapp.QuizApp.model;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
 import java.util.List;
 @Data
 public class SessionResponse {
     List<Response> responseList;
     Integer sessionId;
+    @JsonProperty(access = JsonProperty.Access.READ_ONLY)
     Integer userId;
     String sessionUserId;
 }

src/main/java/com/example/quizapp/QuizApp/security/JwtAuthenticationFilter.java

@@ -1,6 +1,8 @@
 package com.example.quizapp.QuizApp.security;
 
 
+import com.example.quizapp.QuizApp.exceptions.BadRequest;
+import com.example.quizapp.QuizApp.model.UserDTO;
 import io.jsonwebtoken.ExpiredJwtException;
 import io.jsonwebtoken.MalformedJwtException;
 import jakarta.servlet.FilterChain;
@@ -10,6 +12,7 @@
 
 import lombok.extern.slf4j.Slf4j;
 
+import org.modelmapper.ModelMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
@@ -30,9 +33,11 @@ public class JwtAuthenticationFilter extends OncePerRequestFilter {
     private JwtHelper jwtHelper;
 
 
+
     @Autowired
     private UserDetailsService userDetailsService;
 
+    String  userNameByToken;
     @Override
     protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException {
         String requestHeader = request.getHeader("Authorization");
@@ -42,21 +47,21 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse
         String username = null;
         String token = null;
         if (requestHeader != null && requestHeader.startsWith("Bearer")) {
-            //looking good
+
             token = requestHeader.substring(7);
             try {
-
                 username = this.jwtHelper.getUsernameFromToken(token);
-
             } catch (IllegalArgumentException e) {
                 logger.info("Illegal Argument while fetching the username !!");
                 e.printStackTrace();
             } catch (ExpiredJwtException e) {
                 logger.info("Given jwt token is expired !!");
                 e.printStackTrace();
+                throw new BadRequest("Jwt token expired");
             } catch (MalformedJwtException e) {
                 logger.info("Some changed has done in token !! Invalid Token");
                 e.printStackTrace();
+                throw new BadRequest("Jwt token is manipulated");
             } catch (Exception e) {
                 e.printStackTrace();
 
@@ -73,7 +78,8 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse
 
 
             //fetch user detail from username
-            UserDetails userDetails = this.userDetailsService.loadUserByUsername(username);
+             UserDetails userDetails= this.userDetailsService.loadUserByUsername(username);
+             userNameByToken=userDetails.getUsername();
             Boolean validateToken = this.jwtHelper.validateToken(token, userDetails);
             if (validateToken) {
 
@@ -93,4 +99,8 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse
         filterChain.doFilter(request, response);
 
     }
+
+    public String getUserNameByToken() {
+        return userNameByToken;
+    }
 }

src/main/resources/templates/index.html

@@ -67,7 +67,7 @@ <h1>Welcome to My Portfolio</h1>
     <h2>Welcome to Quiz App Backend</h2>
     <p>Hello! I'm [Harsh Raj Srivastav], for accessing API please refer to documentation.</p>
     <ol>
-        <li><a href="http://quiz-app-prod-env.eba-weahtpnc.ap-south-1.elasticbeanstalk.com/swagger-ui/index.html">Swagger Docs</a></li>
+        <li><a href="http://52.66.242.197/swagger-ui/index.html">Swagger Docs</a></li>
         <li><a href="https://github.com/Harsh-Srivastav123/quizApp_backend">GitHub</a></li>
     </ol>
 </section>