fix: add user model in rec response

unithon-10th-1team · Sep 23, 2023 · 4f00d49 · 4f00d49
1 parent c2dd70e
commit 4f00d49
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/src/main/java/com/flickspick/rec/application/RecService.java b/src/main/java/com/flickspick/rec/application/RecService.java
@@ -10,6 +10,7 @@
 import com.flickspick.rec.dto.RecResponse;
 import com.flickspick.recommendtype.application.RecommendTypeService;
 import com.flickspick.recommendtype.model.RecTypeModel;
+import com.flickspick.user.application.UserService;
 import com.flickspick.user_movie_history.application.UserMovieHistoryService;
 import com.flickspick.user_movie_history.domain.UserMovieHistory;
 import lombok.RequiredArgsConstructor;
@@ -29,9 +30,12 @@ public class RecService {
     private final RecommendTypeService recommendTypeService;
     private final MovieService movieService;
     private final MovieRecommendTypeRepository movieRecommendTypeRepository;
+    private final UserService userService;
 
     @SneakyThrows
     public RecResponse get(AuthUser user, RecRequest request) {
+        var userModel = userService.getUserModel(user.getId());
+
         Random rand = new SecureRandom();
         Map<Long, Long> questionAndAnswer = request.getAnswers()
                 .stream()
@@ -57,6 +61,6 @@ public RecResponse get(AuthUser user, RecRequest request) {
 
         userMovieHistoryService.saveUserMovieHistory(userMovieHistory);
 
-        return RecResponse.toResponse(recTypeModel, movieModel, recMovies);
+        return RecResponse.toResponse(recTypeModel, movieModel, recMovies, userModel);
     }
 }
diff --git a/src/main/java/com/flickspick/rec/dto/RecResponse.java b/src/main/java/com/flickspick/rec/dto/RecResponse.java
@@ -2,6 +2,7 @@
 
 import com.flickspick.movie.model.MovieModel;
 import com.flickspick.recommendtype.model.RecTypeModel;
+import com.flickspick.user.model.UserModel;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 
@@ -10,15 +11,17 @@
 @Data
 @AllArgsConstructor
 public class RecResponse {
+    private UserModel user;
     private RecTypeModel recType;
     private MovieModel movie;
     private List<MovieModel> recMovies;
 
-    public static RecResponse toResponse(RecTypeModel recTypeModel, MovieModel movie, List<MovieModel> recMovies) {
-        return new RecResponse(
-                recTypeModel,
-                movie,
-                recMovies
-        );
+    public static RecResponse toResponse(
+            RecTypeModel recTypeModel,
+            MovieModel movie,
+            List<MovieModel> recMovies,
+            UserModel user
+    ) {
+        return new RecResponse(user, recTypeModel, movie, recMovies);
     }
 }