[Fix] #29 온보딩 부분 임시저장 데이터 유지

Author: yeonjuncho

src/main/java/com/leets7th/job_is_be/domain/user/service/ProfileService.java

@@ -80,21 +80,41 @@ public ProfileDraftResponse saveDraft(Long userId, ProfileDraftRequest request)
             throw new GeneralException(ErrorStatus.PROFILE_ALREADY_COMPLETED);
         }
 
-        List<JobCategory> jobCategories = resolveJobCategories(
-                request.jobCategoryIds(),
-                request.primaryJobCategoryId()
-        );
-        Region region = resolveRegion(request.regionId());
+        List<UserJobCategory> currentSelections = findJobCategories(userId);
         profile.updateDraft(
-                request.careerLevel(),
+                request.careerLevel() != null ? request.careerLevel() : profile.getCareerLevel(),
                 request.onboardingStep(),
-                valueCodec.encode(request.preferenceNotes()),
-                valueCodec.encode(request.excludeKeywords()),
-                valueCodec.encode(request.techStacks())
+                request.preferenceNotes() != null
+                        ? valueCodec.encode(request.preferenceNotes())
+                        : profile.getPreferenceNote(),
+                request.excludeKeywords() != null
+                        ? valueCodec.encode(request.excludeKeywords())
+                        : profile.getExcludeKeywords(),
+                request.techStacks() != null
+                        ? valueCodec.encode(request.techStacks())
+                        : profile.getTechStack()
         );
         userProfileRepository.save(profile);
-        replaceJobCategories(user, jobCategories, request.primaryJobCategoryId());
-        replaceRegion(user, region);
+
+        if (request.jobCategoryIds() != null || request.primaryJobCategoryId() != null) {
+            List<Long> categoryIds = request.jobCategoryIds() != null
+                    ? request.jobCategoryIds()
+                    : currentSelections.stream()
+                    .map(selection -> selection.getJobCategory().getId())
+                    .toList();
+            Long primaryId = request.primaryJobCategoryId() != null
+                    ? request.primaryJobCategoryId()
+                    : currentSelections.stream()
+                    .filter(UserJobCategory::isPrimary)
+                    .map(selection -> selection.getJobCategory().getId())
+                    .findFirst()
+                    .orElse(null);
+            replaceJobCategories(user, resolveJobCategories(categoryIds, primaryId), primaryId);
+        }
+
+        if (request.regionId() != null) {
+            replaceRegion(user, resolveRegion(request.regionId()));
+        }
 
         return toDraftResponse(profile, findJobCategories(userId), findRegion(userId));
     }

src/test/java/com/leets7th/job_is_be/domain/user/controller/ProfileControllerIntegrationTest.java

@@ -194,6 +194,44 @@ void rejectsMoreThanThreeJobCategories() throws Exception {
                 .andExpect(jsonPath("$.code").value("PROFILE_400_2"));
     }
 
+    @Test
+    void preservesExistingDraftValuesWhenLaterStepOmitsThem() throws Exception {
+        mockMvc.perform(put("/api/profile/draft")
+                        .with(userJwt())
+                        .contentType(MediaType.APPLICATION_JSON)
+                        .content("""
+                                {
+                                  "onboardingStep": "PROFILE",
+                                  "jobCategoryIds": [%d],
+                                  "primaryJobCategoryId": %d,
+                                  "regionId": %d,
+                                  "careerLevel": "ENTRY",
+                                  "preferenceNotes": ["remote"],
+                                  "excludeKeywords": ["night shift"],
+                                  "techStacks": ["Java"]
+                                }
+                                """.formatted(jobCategoryIds.get(0), jobCategoryIds.get(0), regionId)))
+                .andExpect(status().isOk());
+
+        mockMvc.perform(put("/api/profile/draft")
+                        .with(userJwt())
+                        .contentType(MediaType.APPLICATION_JSON)
+                        .content("""
+                                {
+                                  "onboardingStep": "QUIZ"
+                                }
+                                """))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.data.onboardingStep").value("QUIZ"))
+                .andExpect(jsonPath("$.data.jobCategories.length()").value(1))
+                .andExpect(jsonPath("$.data.jobCategories[0].id").value(jobCategoryIds.get(0)))
+                .andExpect(jsonPath("$.data.region.id").value(regionId))
+                .andExpect(jsonPath("$.data.careerLevel").value("ENTRY"))
+                .andExpect(jsonPath("$.data.preferenceNotes[0]").value("remote"))
+                .andExpect(jsonPath("$.data.excludeKeywords[0]").value("night shift"))
+                .andExpect(jsonPath("$.data.techStacks[0]").value("Java"));
+    }
+
     @Test
     void profileEndpointRejectsIncompleteDraft() throws Exception {
         mockMvc.perform(put("/api/profile/draft")