fix(#21): merge conflict 해결

najasin · Aug 20, 2023 · ac10268 · ac10268
1 parent 8685301
commit ac10268
Showing 1 changed file with 2 additions and 7 deletions.
diff --git a/src/main/java/com/najasin/domain/user/controller/UserController.java b/src/main/java/com/najasin/domain/user/controller/UserController.java
@@ -150,20 +150,15 @@ public ResponseEntity<ApiResponse<?>> postOthersManual(
 	public ResponseEntity<ApiResponse<?>> getMyManual(
 			@PathVariable String userTypeName,
 			@AuthorizeUser User user
-
 	) {
 		Manual manual = new Manual();
 		String userId = user.getId();
-		manual.setNickname(user.getNickname());
-		manual.setBaseImage("https://picsum.photos/200/300?random=1");
-		CharacterItems characterInfoDTO = userUserTypeService.getCharacter(userId, userTypeName);
-		manual.setCharacterItems(characterService.getAllCharacterItems().getCharacterItems());
-		manual.setExampleKeywords(keywordService.getAllKeywords());
-
 		if(!isNull(user)) {
 			manual.setNickname(user.getId());
 		}
 		manual.setBaseImage("https://picsum.photos/200/300?random=1");
+		manual.setExampleKeywords(keywordService.getAllKeywords());
+		manual.setBaseImage("https://picsum.photos/200/300?random=1");
 		manual.setCharacterItems(characterService.getAllCharacterItems().getCharacterItems());
 		manual.setQuestions(questionService.getQuestionByQuestionTypeAndUserType(QuestionType.FOR_USER, userTypeName));
 		return new ResponseEntity<>(