Merge pull request #647 from bounswe/develop

bounswe · Dec 9, 2024 · 8c293f9 · 8c293f9
2 parents c08a16e + 07f6fa6
commit 8c293f9
Show file tree

Hide file tree

Showing 41 changed files with 1,787 additions and 417 deletions.
diff --git a/backend/src/main/java/com/group1/programminglanguagesforum/Config/ModelMapperConfig.java b/backend/src/main/java/com/group1/programminglanguagesforum/Config/ModelMapperConfig.java
@@ -28,13 +28,15 @@ protected void configure() {
                 skip(destination.getPassword());
                 skip(destination.getFollowers());
                 skip(destination.getFollowing());
+
             }
         });
         modelMapper.addMappings(new PropertyMap<User, SelfProfileResponseDto>() {
             @Override
             protected void configure() {
                 skip(destination.getQuestions());
                 skip(destination.getAnswers());
+                map(source.getReputationPoints(), destination.getReputationPoints());
             }
         });
         modelMapper.addMappings(new PropertyMap <UserProfileResponseDto,User>() {
@@ -46,6 +48,14 @@ protected void configure() {
 
             }
         });
+        modelMapper.addMappings(new PropertyMap <User,UserProfileResponseDto>() {
+            @Override
+            protected void configure() {
+                skip(destination.getFollowedTags());
+                map(source.getReputationPoints(), destination.getReputationPoints());
+
+            }
+        });
         modelMapper.addMappings(new PropertyMap<Question, GetQuestionWithTagDto>() {
             @Override
             protected void configure() {
@@ -87,6 +97,54 @@ protected void configure() {
             }
         });
 
+        modelMapper.addMappings(new PropertyMap<User, AuthorDto>() {
+            @Override
+            protected void configure() {
+                map(source.getId(), destination.getId());
+                map(source.getUsername(), destination.getUsername());
+                map(source.getReputationPoints(), destination.getReputationPoints());
+
+                using(context -> {
+                    User user = (User) context.getSource();
+                    String firstName = user.getFirstName() != null ? user.getFirstName() : "";
+                    String lastName = user.getLastName() != null ? user.getLastName() : "";
+                    return (firstName + " " + lastName).trim();
+                }).map(source, destination.getName());
+
+                map().setProfilePicture(null); // Set a default value for profile picture
+            }
+        });
+
+
+        modelMapper.addMappings(new PropertyMap<Question, QuestionSummaryDto>() {
+            @Override
+            protected void configure() {
+                map(source.getId(), destination.getId());
+                map(source.getTitle(), destination.getTitle());
+                map(source.getQuestionBody(), destination.getContent());
+                map(source.getDifficulty(), destination.getDifficulty());
+                map(source.getUpvoteCount(), destination.getUpvoteCount());
+                map(source.getDownvoteCount(), destination.getDownvoteCount());
+                map(source.getCommentCount(), destination.getAnswerCount());
+                using(context -> modelMapper.map(context.getSource(), AuthorDto.class))
+                    .map(source.getAskedBy(), destination.getAuthor());
+                map(source.getTags(), destination.getTags());
+
+            }
+        });
+
+        modelMapper.addMappings(new PropertyMap<Question, BookmarkQuestionResponseDto>() {
+            @Override
+            protected void configure() {
+                map(source.getId(), destination.getId());
+                map(source.getTitle(), destination.getTitle());
+                map(source.getUpvoteCount(), destination.getUpvoteCount());
+                map(source.getDownvoteCount(), destination.getDownvoteCount());
+            }
+        });
+
+
+
         return modelMapper;
     }
 }
diff --git a/backend/src/main/java/com/group1/programminglanguagesforum/Constants/EndpointConstants.java b/backend/src/main/java/com/group1/programminglanguagesforum/Constants/EndpointConstants.java
@@ -33,6 +33,7 @@ public static class QuestionEndpoints {
         public static final String QUESTION_DELETE_UPVOTE = QUESTION_ID + "/deleteUpvote";
         public static final String QUESTION_DELETE_DOWNVOTE = QUESTION_ID + "/deleteDownvote";
         public static final String QUESTION_ANSWERS = BASE_PATH + "/{questionId}/answers";
+        public static final String QUESTION_DIFFICULTY_VOTE = QUESTION_ID + "/vote-difficulty";
     }
 
     public static class AnswerEndpoints {
@@ -56,6 +57,7 @@ public static class TagEndpoints {
     public static class BookmarkEndpoints {
         public static final String BASE_PATH = "/questions/{questionId}/bookmarks";
         public static final String BOOKMARK_DELETE = BASE_PATH;
+        public static final String BOOKMARK_GET = "/questions/bookmarked";
     }
 
     public static class SearchEndpoints {

diff --git a/backend/src/main/java/com/group1/programminglanguagesforum/Constants/GeneralConstants.java b/backend/src/main/java/com/group1/programminglanguagesforum/Constants/GeneralConstants.java
@@ -11,7 +11,7 @@ public static class SparqlConstants {
                         (SAMPLE(?officialWebSite) AS ?officialWebSiteS)\s
                         (SAMPLE(?stackExchangeTag) AS ?stackExchangeTagS)
                     WHERE {
-                        ?library wdt:P31 wd:Q188860.  
+                        ?library wdt:P31 wd:Q188860.
                         
                         FILTER (
                             EXISTS { ?library wdt:P154 ?logoImage }

diff --git a/...nd/src/main/java/com/group1/programminglanguagesforum/Controllers/BookmarkController.java b/...nd/src/main/java/com/group1/programminglanguagesforum/Controllers/BookmarkController.java
@@ -2,21 +2,25 @@
 
 import com.group1.programminglanguagesforum.Constants.EndpointConstants;
 import com.group1.programminglanguagesforum.DTOs.Responses.BookmarkQuestionResponseDto;
-import com.group1.programminglanguagesforum.DTOs.Responses.ErrorResponse;
+import com.group1.programminglanguagesforum.DTOs.Responses.QuestionSummaryDto;
 import com.group1.programminglanguagesforum.DTOs.Responses.GenericApiResponse;
 import com.group1.programminglanguagesforum.Exceptions.UnauthorizedAccessException;
+import com.group1.programminglanguagesforum.Exceptions.ExceptionResponseHandler;
 import com.group1.programminglanguagesforum.Services.BookmarkService;
 import com.group1.programminglanguagesforum.Util.ApiResponseBuilder;
+
+import jakarta.persistence.EntityExistsException;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.Arrays;
+import java.util.List;
 import java.util.NoSuchElementException;
 
 @RequestMapping("api/v1")
@@ -36,29 +40,12 @@ public ResponseEntity<GenericApiResponse<BookmarkQuestionResponseDto>> bookmarkQ
                     bookmarkQuestionResponseDto
             );
             return buildResponse(genericApiResponse, HttpStatus.OK);
-
-
         } catch (NoSuchElementException e) {
-            ErrorResponse errorResponse = ErrorResponse.builder()
-                    .errorMessage(e.getMessage())
-                    .stackTrace(Arrays.toString(e.getStackTrace()))
-                    .build();
-            GenericApiResponse<BookmarkQuestionResponseDto> genericApiResponse = ApiResponseBuilder.buildErrorResponse(
-                    BookmarkQuestionResponseDto.class,
-                    "An error occurred while bookmarking the question",
-                    HttpStatus.NOT_FOUND.value(),
-                    errorResponse
-            );
-            return buildResponse(genericApiResponse, HttpStatus.NOT_FOUND);
+            return ExceptionResponseHandler.NoSuchElementException(e);
         } catch (UnauthorizedAccessException e) {
-            ErrorResponse errorResponse = ErrorResponse.builder()
-                    .errorMessage(e.getMessage())
-                    .stackTrace(Arrays.toString(e.getStackTrace()))
-                    .build();
-            GenericApiResponse<BookmarkQuestionResponseDto> response = ApiResponseBuilder
-                    .buildErrorResponse(BookmarkQuestionResponseDto.class, e.getMessage(), 401, errorResponse);
-            return buildResponse(response, HttpStatus.UNAUTHORIZED);
-
+            return ExceptionResponseHandler.UnauthorizedAccessException(e);
+        } catch (EntityExistsException e) {
+            return ExceptionResponseHandler.EntityExistsException(e);
         }
     }
 
@@ -73,27 +60,27 @@ public ResponseEntity<GenericApiResponse<BookmarkQuestionResponseDto>> removeBoo
                     bookmarkQuestionResponseDto
             );
             return buildResponse(genericApiResponse, HttpStatus.OK);
+        } catch (NoSuchElementException e) {
+            return ExceptionResponseHandler.NoSuchElementException(e);
+        } catch (UnauthorizedAccessException e) {
+            return ExceptionResponseHandler.UnauthorizedAccessException(e);
         }
-        catch (NoSuchElementException e) {
-            ErrorResponse errorResponse = ErrorResponse.builder()
-                    .errorMessage(e.getMessage())
-                    .stackTrace(Arrays.toString(e.getStackTrace()))
-                    .build();
-            GenericApiResponse<BookmarkQuestionResponseDto> genericApiResponse = ApiResponseBuilder.buildErrorResponse(
-                    BookmarkQuestionResponseDto.class,
-                    "An error occurred while deleting the bookmark",
-                    HttpStatus.NOT_FOUND.value(),
-                    errorResponse
+    }
+
+    @GetMapping(value = EndpointConstants.BookmarkEndpoints.BOOKMARK_GET)
+    public ResponseEntity<GenericApiResponse<List<QuestionSummaryDto>>> getBookmarkedQuestions() {
+        try {
+            List<QuestionSummaryDto> bookmarkedQuestions = bookmarkService.getBookmarkedQuestions();
+            GenericApiResponse<List<QuestionSummaryDto>> genericApiResponse = ApiResponseBuilder.buildSuccessResponse(
+                    QuestionSummaryDto.class,
+                    "Bookmarked questions retrieved successfully",
+                    200,
+                    bookmarkedQuestions
             );
-            return buildResponse(genericApiResponse, HttpStatus.NOT_FOUND);
+            return buildResponse(genericApiResponse, HttpStatus.OK);
         } catch (UnauthorizedAccessException e) {
-            ErrorResponse errorResponse = ErrorResponse.builder()
-                    .errorMessage(e.getMessage())
-                    .stackTrace(Arrays.toString(e.getStackTrace()))
-                    .build();
-            GenericApiResponse<BookmarkQuestionResponseDto> response = ApiResponseBuilder
-                    .buildErrorResponse(BookmarkQuestionResponseDto.class, e.getMessage(), 401, errorResponse);
-            return buildResponse(response, HttpStatus.UNAUTHORIZED);
-        }
+            return ExceptionResponseHandler.UnauthorizedAccessException(e);
+        } 
     }
+
 }
diff --git a/...c/main/java/com/group1/programminglanguagesforum/Controllers/CodeExecutionController.java b/...c/main/java/com/group1/programminglanguagesforum/Controllers/CodeExecutionController.java
@@ -27,6 +27,10 @@ public ResponseEntity<GenericApiResponse<CodeExecutionResponseDTO>> executeCode(
     ) {
         try {
             CodeExecutionResponseDTO responseDTO = codeExecutionService.executeCode(requestDto.getCode(), requestDto.getLanguage(), requestDto.getInput());
+            int status = responseDTO.getStatus().equals("Accepted") ? HttpStatus.OK.value() : HttpStatus.INTERNAL_SERVER_ERROR.value();
+            if (status == HttpStatus.INTERNAL_SERVER_ERROR.value()) {
+                throw new Exception(responseDTO.getStatus());
+            }
             GenericApiResponse<CodeExecutionResponseDTO> response =
                     ApiResponseBuilder.buildSuccessResponse(
                             responseDTO.getClass(),

diff --git a/...nd/src/main/java/com/group1/programminglanguagesforum/Controllers/QuestionController.java b/...nd/src/main/java/com/group1/programminglanguagesforum/Controllers/QuestionController.java
@@ -2,16 +2,14 @@
 
 import com.group1.programminglanguagesforum.Constants.EndpointConstants;
 import com.group1.programminglanguagesforum.DTOs.Requests.CreateQuestionRequestDto;
+import com.group1.programminglanguagesforum.DTOs.Requests.DifficultyLevelRequestDto;
 import com.group1.programminglanguagesforum.DTOs.Requests.UpdateQuestionRequestDto;
-import com.group1.programminglanguagesforum.DTOs.Responses.CreateQuestionResponseDto;
-import com.group1.programminglanguagesforum.DTOs.Responses.ErrorResponse;
-import com.group1.programminglanguagesforum.DTOs.Responses.GenericApiResponse;
+import com.group1.programminglanguagesforum.DTOs.Responses.*;
 import com.group1.programminglanguagesforum.Exceptions.ExceptionResponseHandler;
-import com.group1.programminglanguagesforum.DTOs.Responses.GetQuestionDetailsResponseDto;
-import com.group1.programminglanguagesforum.DTOs.Responses.QuestionSummaryDto;
 import com.group1.programminglanguagesforum.Entities.DifficultyLevel;
 import com.group1.programminglanguagesforum.Entities.Question;
 import com.group1.programminglanguagesforum.Exceptions.UnauthorizedAccessException;
+import com.group1.programminglanguagesforum.Services.QuestionDifficultyRateService;
 import com.group1.programminglanguagesforum.Services.QuestionService;
 import com.group1.programminglanguagesforum.Util.ApiResponseBuilder;
 import lombok.RequiredArgsConstructor;
@@ -32,6 +30,7 @@
 @RequiredArgsConstructor
 public class QuestionController extends BaseController {
     private final QuestionService questionService;
+    private final QuestionDifficultyRateService questionDifficultyRateService;
 
     @PostMapping(value = EndpointConstants.QuestionEndpoints.BASE_PATH)
     public ResponseEntity<GenericApiResponse<CreateQuestionResponseDto>> createQuestion(
@@ -132,4 +131,21 @@ public ResponseEntity<GenericApiResponse<Map<String, Object>>> searchQuestions(
                 HttpStatus.OK);
     }
 
+    @PostMapping(value = EndpointConstants.QuestionEndpoints.QUESTION_DIFFICULTY_VOTE)
+    public ResponseEntity<GenericApiResponse<QuestionRateResponseDto>> rateQuestion(
+            @PathVariable(value = "id") Long id,
+            @RequestBody DifficultyLevelRequestDto dto) {
+        try {
+            GenericApiResponse<QuestionRateResponseDto> response = ApiResponseBuilder.buildSuccessResponse(
+                    QuestionRateResponseDto.class, "Question rated successfully", 200,
+                    questionDifficultyRateService.rateQuestion(id, dto.getDifficulty()));
+            return buildResponse(response, org.springframework.http.HttpStatus.OK);
+        } catch (NoSuchElementException e) {
+            return ExceptionResponseHandler.NoSuchElementException(e);
+        }
+        catch (UnauthorizedAccessException e) {
+            return ExceptionResponseHandler.UnauthorizedAccessException(e);
+        }
+    }
+
 }
diff --git a/backend/src/main/java/com/group1/programminglanguagesforum/Controllers/UserController.java b/backend/src/main/java/com/group1/programminglanguagesforum/Controllers/UserController.java
@@ -6,10 +6,7 @@
 import com.group1.programminglanguagesforum.Entities.User;
 import com.group1.programminglanguagesforum.Exceptions.UnauthorizedAccessException;
 import com.group1.programminglanguagesforum.Exceptions.UserNotFoundException;
-import com.group1.programminglanguagesforum.Services.AnswerService;
-import com.group1.programminglanguagesforum.Services.QuestionService;
-import com.group1.programminglanguagesforum.Services.UserContextService;
-import com.group1.programminglanguagesforum.Services.UserService;
+import com.group1.programminglanguagesforum.Services.*;
 import com.group1.programminglanguagesforum.Util.ApiResponseBuilder;
 import lombok.RequiredArgsConstructor;
 import org.modelmapper.ModelMapper;
@@ -33,6 +30,7 @@ public class UserController extends BaseController {
         private final ModelMapper modelMapper;
         private final QuestionService questionService;
         private final AnswerService answerService;
+        private final TagService tagService;
 
         @GetMapping(value = EndpointConstants.UserEndpoints.USER_ME)
         public ResponseEntity<GenericApiResponse<SelfProfileResponseDto>> getUser() {
@@ -43,6 +41,10 @@ public ResponseEntity<GenericApiResponse<SelfProfileResponseDto>> getUser() {
                                         SelfProfileResponseDto.class);
                         List<QuestionSummaryDto> questions = questionService.findByAuthorId(user.getId());
                         List<GetAnswerDtoForProfile> answers = answerService.findByAnsweredBy(user.getId());
+                        selfProfileResponseDto.setFollowedTags(
+                                tagService.getFollowedTags(user.getId())
+                        );
+                        selfProfileResponseDto.setReputationPoints(userService.calculateReputation(user));
                         selfProfileResponseDto.setQuestionCount((long) questions.size());
                         selfProfileResponseDto.setQuestions(
                                 questions);
@@ -80,7 +82,12 @@ public ResponseEntity<GenericApiResponse<UserProfileResponseDto>> getUserById(
                 if (user.isPresent()) {
                         UserProfileResponseDto userProfileResponseDto = modelMapper.map(user.get(),
                                         UserProfileResponseDto.class);
+                        userProfileResponseDto.setReputationPoints(userService.calculateReputation(user.get()));
                         userProfileResponseDto.setSelfFollowing(userService.selfFollowing(user.get()));
+                        userProfileResponseDto.setFollowedTags(
+                                tagService.getFollowedTags(user.get().getId())
+                        );
+
 
                         GenericApiResponse<UserProfileResponseDto> response = ApiResponseBuilder.buildSuccessResponse(
                                         userProfileResponseDto.getClass(),

diff --git a/...in/java/com/group1/programminglanguagesforum/DTOs/Requests/DifficultyLevelRequestDto.java b/...in/java/com/group1/programminglanguagesforum/DTOs/Requests/DifficultyLevelRequestDto.java
@@ -0,0 +1,13 @@
+package com.group1.programminglanguagesforum.DTOs.Requests;
+
+import com.group1.programminglanguagesforum.Entities.DifficultyLevel;
+import lombok.*;
+
+@Builder
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+public class DifficultyLevelRequestDto {
+    private DifficultyLevel difficulty;
+}
diff --git a/...ain/java/com/group1/programminglanguagesforum/DTOs/Requests/UpdateQuestionRequestDto.java b/...ain/java/com/group1/programminglanguagesforum/DTOs/Requests/UpdateQuestionRequestDto.java
@@ -1,5 +1,6 @@
 package com.group1.programminglanguagesforum.DTOs.Requests;
 
+import com.group1.programminglanguagesforum.Entities.DifficultyLevel;
 import lombok.*;
 
 import java.util.List;
@@ -13,4 +14,5 @@ public class UpdateQuestionRequestDto {
     private String title;
     private String content;
     private List<Long> tags;
+    private DifficultyLevel difficulty;
 }
diff --git a/...va/com/group1/programminglanguagesforum/DTOs/Responses/GetQuestionDetailsResponseDto.java b/...va/com/group1/programminglanguagesforum/DTOs/Responses/GetQuestionDetailsResponseDto.java
@@ -1,5 +1,6 @@
 package com.group1.programminglanguagesforum.DTOs.Responses;
 
+import com.group1.programminglanguagesforum.Entities.DifficultyLevel;
 import lombok.*;
 
 import java.util.ArrayList;
@@ -18,6 +19,7 @@ public class GetQuestionDetailsResponseDto {
     private Long dislikeCount;
     private Long commentCount;
     private Boolean selfQuestion;
+    private DifficultyLevel difficulty;
     private Integer selfVoted;
     private String createdAt;
     @Builder.Default
@@ -30,5 +32,10 @@ public class GetQuestionDetailsResponseDto {
     private Long answerCount = 0L;
     @Builder.Default
     private boolean bookmarked = false;
+    @Builder.Default
+    private DifficultyLevel  selfDifficultyVote =null;
+    private Long easyCount;
+    private Long mediumCount;
+    private Long hardCount;
 
 }
diff --git a/...ain/java/com/group1/programminglanguagesforum/DTOs/Responses/QuestionRateResponseDto.java b/...ain/java/com/group1/programminglanguagesforum/DTOs/Responses/QuestionRateResponseDto.java
@@ -0,0 +1,18 @@
+package com.group1.programminglanguagesforum.DTOs.Responses;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class QuestionRateResponseDto {
+    private Long questionId;
+    private Long easyCount;
+    private Long mediumCount;
+    private Long hardCount;
+    private Long totalCount;
+}