fix: 데이터 복구 후 유저 정보 변경 로직 추가

ori0o0p · ori0o0p · commit 2ca463e6fbbb · 2025-03-19T10:32:33.000+09:00
diff --git a/src/main/java/com/dsm/repo/external/web/rest/resume/dto/ResumeElementDto.java b/src/main/java/com/dsm/repo/external/web/rest/resume/dto/ResumeElementDto.java
@@ -20,7 +20,7 @@ public enum Status {
     }
 
     public record Writer(
-            String accountId,
+            String id,
             String name,
             SchoolInfo schoolInfo,
             String major,
@@ -29,7 +29,7 @@ public record Writer(
             String url
     ) {
         public Writer update(String major, String email, List<String> skillSet, String url) {
-            return new Writer(accountId, name, schoolInfo, major, email, skillSet, url);
+            return new Writer(id, name, schoolInfo, major, email, skillSet, url);
         }
 
         public record SchoolInfo(
diff --git a/src/main/java/com/dsm/repo/external/web/rest/student/dto/StudentElementDto.java b/src/main/java/com/dsm/repo/external/web/rest/student/dto/StudentElementDto.java
@@ -7,5 +7,8 @@ public record ClassInfo(
             Integer number,
             String schoolNumber
     ) {
+        public ClassInfo(Integer grade, Integer classNumber, Integer number) {
+            this(grade, classNumber, number, String.format("%1d%1d%02d", grade, classNumber, number));
+        }
     }
 }
diff --git a/src/main/java/com/dsm/repo/internal/core/domain/component/student/impl/CurrentStudentImpl.java b/src/main/java/com/dsm/repo/internal/core/domain/component/student/impl/CurrentStudentImpl.java
@@ -32,14 +32,14 @@ public StudentModel getStudent() {
     @Override
     @Transactional
     public ResumeModel getResume() {
-        return resumeRepository.findByWriterAccountId(getStudent().accountId())
+        return resumeRepository.findByWriterId(getStudent().accountId())
                 .orElseThrow(() -> ResumeNotFoundException.EXCEPTION);
     }
 
     @Override
     @Transactional
-    public ResumeModel getResume(String accountId) {
-        return resumeRepository.findByWriterAccountId(accountId)
+    public ResumeModel getResume(String studentId) {
+        return resumeRepository.findById(studentId)
                 .orElseThrow(() -> ResumeNotFoundException.EXCEPTION);
     }
 
diff --git a/src/main/java/com/dsm/repo/internal/core/domain/model/resume/ResumeModel.java b/src/main/java/com/dsm/repo/internal/core/domain/model/resume/ResumeModel.java
@@ -31,6 +31,10 @@ public static ResumeModel createInitialResume(String id, String name, ResumeElem
         );
     }
 
+    public ResumeModel updateYear() {
+        return new ResumeModel(id, Year.now().getValue(), status, writer, introduce, projectList, achievementList, activityList);
+    }
+
     public ResumeModel release() {
         return new ResumeModel(id, year, ResumeElementDto.Status.RELEASED, writer, introduce, projectList, achievementList, activityList);
     }
diff --git a/src/main/java/com/dsm/repo/internal/core/domain/model/student/StudentModel.java b/src/main/java/com/dsm/repo/internal/core/domain/model/student/StudentModel.java
@@ -17,6 +17,10 @@ public StudentModel updateMajor(String majorName) {
         return new StudentModel(id, accountId, password, name, classInfo, profileImagePath, majorName);
     }
 
+    public StudentModel updateClassInfo(StudentElementDto.ClassInfo classInfo) {
+        return new StudentModel(id, accountId, password, name, classInfo, profileImagePath, major);
+    }
+
     public StudentModel(String accountId, String password, String name, Integer grade, Integer classNumber, Integer number, String profileImagePath, String majorName) {
         this(null,
                 accountId,
@@ -25,8 +29,7 @@ public StudentModel(String accountId, String password, String name, Integer grad
                 new StudentElementDto.ClassInfo(
                         grade,
                         classNumber,
-                        number,
-                        String.format("%1d%1d%02d", grade, classNumber, number)
+                        number
                 ),
                 profileImagePath,
                 majorName
diff --git a/src/main/java/com/dsm/repo/internal/core/domain/service/auth/StudentLoginService.java b/src/main/java/com/dsm/repo/internal/core/domain/service/auth/StudentLoginService.java
@@ -1,9 +1,13 @@
 package com.dsm.repo.internal.core.domain.service.auth;
 
+import com.dsm.repo.external.exception.domain.resume.ResumeNotFoundException;
+import com.dsm.repo.external.web.rest.student.dto.StudentElementDto;
+import com.dsm.repo.internal.core.domain.model.resume.ResumeModel;
 import com.dsm.repo.internal.core.usecase.auth.StudentLoginUseCase;
 import com.dsm.repo.external.exception.error.ErrorCode;
 import com.dsm.repo.external.exception.ExternalException;
 import com.dsm.repo.internal.core.domain.model.student.StudentModel;
+import com.dsm.repo.internal.data.repository.resume.ResumeRepository;
 import com.dsm.repo.internal.data.repository.student.StudentRepository;
 import com.dsm.repo.external.web.rest.auth.dto.AuthElementDto;
 import com.dsm.repo.external.web.rest.auth.dto.request.LoginRequest;
@@ -23,6 +27,8 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.Year;
+
 @Service
 @RequiredArgsConstructor
 class StudentLoginService implements StudentLoginUseCase {
@@ -34,6 +40,8 @@ class StudentLoginService implements StudentLoginUseCase {
     private final CreateResumeComponent createResumeComponent;
     private final DefaultProfileImageProperties defaultProfileImageProperties;
 
+    private final ResumeRepository resumeRepository; // TODO: 3/19/25 안티패턴
+
     @Override
     @Transactional
     public TokenResponse studentLogin(LoginRequest request) {
@@ -43,13 +51,34 @@ public TokenResponse studentLogin(LoginRequest request) {
     }
 
     private TokenResponse loginExistingStudent(LoginRequest request) {
-        final var student = studentRepository.findByAccountId(request.accountId())
+        final StudentModel student = studentRepository.findByAccountId(request.accountId())
                 .orElseThrow(() -> StudentNotFoundException.EXCEPTION);
 
         if (!passwordEncoder.matches(request.password(), student.password())) {
             throw PasswordMismatchException.EXCEPTION;
         }
 
+        final ResumeModel resume = resumeRepository.findByWriterId(student.id())
+                .orElseThrow(() -> ResumeNotFoundException.EXCEPTION);
+
+        if ( // TODO: 3/19/25 안티패턴
+            resume.year() != Year.now().getValue() // 현재 년도와 다르면 xquare 요청 후 유저 정보 업데이트
+        ) {
+            final XquareUserResponse xquareUserResponse = xquareClient.xquareUser(request);
+
+            final StudentModel updatedStudent = student.updateClassInfo(
+                    new StudentElementDto.ClassInfo(
+                        xquareUserResponse.getGrade(),
+                        xquareUserResponse.getClassNum(),
+                        xquareUserResponse.getNum()
+                    )
+            );
+            studentRepository.save(updatedStudent);
+
+            final ResumeModel updatedResume = resume.updateYear();
+            resumeRepository.save(updatedResume);
+        }
+
         return getTokenResponse(student.id());
     }
 
diff --git a/src/main/java/com/dsm/repo/internal/core/domain/service/resume/ResumeReviseService.java b/src/main/java/com/dsm/repo/internal/core/domain/service/resume/ResumeReviseService.java
@@ -25,7 +25,7 @@ class ResumeReviseService implements ResumeReviseUseCase {
     @Override
     public void revise(final ResumeElementDto.ReviseRequest request) {
         final var student = currentStudent.getStudent();
-        final var resume = currentStudent.getResume(student.accountId());
+        final var resume = currentStudent.getResume(student.id());
 
         reviseProcess(request, resume);
         publishMajorUpdateEvent(request.writer().major(), student.id());
diff --git a/src/main/java/com/dsm/repo/internal/data/repository/resume/AbstractResumeRepository.java b/src/main/java/com/dsm/repo/internal/data/repository/resume/AbstractResumeRepository.java
@@ -19,8 +19,8 @@ public Optional<ResumeModel> findById(String resumeId) {
     }
 
     @Override
-    public Optional<ResumeModel> findByWriterAccountId(String accountId) {
-        return resumeEntityMapper.toOptionalModel(resumeMongoRepository.findByWriterAccountId(accountId));
+    public Optional<ResumeModel> findByWriterId(String accountId) {
+        return resumeEntityMapper.toOptionalModel(resumeMongoRepository.findByWriterId(accountId));
     }
 
     @Override
diff --git a/src/main/java/com/dsm/repo/internal/data/repository/resume/ResumeEntity.java b/src/main/java/com/dsm/repo/internal/data/repository/resume/ResumeEntity.java
@@ -80,7 +80,7 @@ enum Type {
     }
 
     record Writer(
-            String accountId, //todo 현재 유저 고유 아이디 저장 중 -> 변경후 -> 유저
+            String id,
             String name,
             SchoolInfo schoolInfo,
             String major,
diff --git a/src/main/java/com/dsm/repo/internal/data/repository/resume/ResumeMongoRepository.java b/src/main/java/com/dsm/repo/internal/data/repository/resume/ResumeMongoRepository.java
@@ -6,7 +6,7 @@
 import java.util.stream.Stream;
 
 interface ResumeMongoRepository extends MongoRepository<ResumeEntity, String> {
-    Optional<ResumeEntity> findByWriterAccountId(String accountId);
+    Optional<ResumeEntity> findByWriterId(String id);
     Stream<ResumeEntity> findAllByStatus(ResumeEntity.Status status);
     Stream<ResumeEntity> findAllByWriterSchoolInfoGenerationAndYearAndStatus(int generation, int year, ResumeEntity.Status status);
 
diff --git a/src/main/java/com/dsm/repo/internal/data/repository/resume/ResumeRepository.java b/src/main/java/com/dsm/repo/internal/data/repository/resume/ResumeRepository.java
@@ -7,7 +7,7 @@
 
 public interface ResumeRepository {
     Optional<ResumeModel> findById(String resumeId);
-    Optional<ResumeModel> findByWriterAccountId(String accountId);
+    Optional<ResumeModel> findByWriterId(String accountId);
     Stream<ResumeModel> searchResumes(String name, Integer grade, Integer classNumber, String majorId, String status);
     Stream<ResumeModel> getReleasedResumes();
     ResumeModel save(ResumeModel resume);

Original file line number	Diff line number	Diff line change
`@@ -7,5 +7,8 @@ public record ClassInfo(`
`7`	`7`	`Integer number,`
`8`	`8`	`String schoolNumber`
`9`	`9`	`) {`
	`10`	`+ public ClassInfo(Integer grade, Integer classNumber, Integer number) {`
	`11`	`+ this(grade, classNumber, number, String.format("%1d%1d%02d", grade, classNumber, number));`
	`12`	`+ }`
`10`	`13`	`}`
`11`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,10 @@ public static ResumeModel createInitialResume(String id, String name, ResumeElem`
`31`	`31`	`);`
`32`	`32`	`}`
`33`	`33`
	`34`	`+ public ResumeModel updateYear() {`
	`35`	`+ return new ResumeModel(id, Year.now().getValue(), status, writer, introduce, projectList, achievementList, activityList);`
	`36`	`+ }`
	`37`	`+`
`34`	`38`	`public ResumeModel release() {`
`35`	`39`	`return new ResumeModel(id, year, ResumeElementDto.Status.RELEASED, writer, introduce, projectList, achievementList, activityList);`
`36`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,8 +19,8 @@ public Optional<ResumeModel> findById(String resumeId) {`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`@Override`
`22`		`- public Optional<ResumeModel> findByWriterAccountId(String accountId) {`
`23`		`- return resumeEntityMapper.toOptionalModel(resumeMongoRepository.findByWriterAccountId(accountId));`
	`22`	`+ public Optional<ResumeModel> findByWriterId(String accountId) {`
	`23`	`+ return resumeEntityMapper.toOptionalModel(resumeMongoRepository.findByWriterId(accountId));`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ enum Type {`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`record Writer(`
`83`		`- String accountId, //todo 현재 유저 고유 아이디 저장 중 -> 변경후 -> 유저`
	`83`	`+ String id,`
`84`	`84`	`String name,`
`85`	`85`	`SchoolInfo schoolInfo,`
`86`	`86`	`String major,`