Merge branch 'develop' of https://github.com/najasin/na-jasin-be into…

… feature/#21
najasin · Aug 22, 2023 · ad20cac · ad20cac
2 parents a4087cc + c572c61
commit ad20cac
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/main/java/com/najasin/domain/character/controller/CharacterController.java b/src/main/java/com/najasin/domain/character/controller/CharacterController.java
@@ -5,6 +5,7 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -17,7 +18,7 @@
 import lombok.RequiredArgsConstructor;
 
 @RestController
-@RequestMapping("/api/characterItems")
+@RequestMapping("/api/{userType}/characterItems")
 @RequiredArgsConstructor
 public class CharacterController {
 
@@ -26,7 +27,7 @@ public class CharacterController {
 	private String baseImage;
 
 	@GetMapping
-	public ResponseEntity<ApiResponse<CharacterItemsResponse>> getCharacterItems() {
+	public ResponseEntity<ApiResponse<CharacterItemsResponse>> getCharacterItems(@PathVariable String userType) {
 		CharacterItemsParam characterItems = characterService.findAllItems();
 		return ResponseEntity.ok(createSuccessWithData(
 			CharacterItemResponse.FIND_ALL_ITEMS_SUCCESS.getMsg(),

diff --git a/src/main/java/com/najasin/domain/user/service/UserUserTypeService.java b/src/main/java/com/najasin/domain/user/service/UserUserTypeService.java
@@ -69,9 +69,9 @@ public void updateCharacter(UserUserType userUserType, ManualCharacterItems item
 			userUserType.updateCharacter(characterService.findCharacterSetById(items.set()));
 		} else {
 			userUserType.updateCharacter(
-				characterService.findFaceById(items.face()),
-				characterService.findBodyById(items.body()),
-				characterService.findExpressionById(items.expression()));
+				isNull(items.face()) ? null : characterService.findFaceById(items.face()),
+				isNull(items.body()) ? null : characterService.findBodyById(items.body()),
+				isNull(items.expression()) ? null : characterService.findExpressionById(items.expression()));
 		}
 	}