Merge branch 'develop' of https://github.com/For-In-K/forink-back into develop

Author: redzzzi

src/main/java/com/forink/forink/exam/entity/dao/ExamRepository.java

@@ -8,4 +8,5 @@
 public interface ExamRepository extends JpaRepository<Exam, Long> {
 
     Optional<Exam> findByMember(final Member member);
+    boolean existsByMember(final Member member);
 }

src/main/java/com/forink/forink/global/config/JpaAuditingConfig.java

@@ -0,0 +1,9 @@
+package com.forink.forink.global.config;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
+
+@Configuration
+@EnableJpaAuditing
+public class JpaAuditingConfig {
+}

src/main/java/com/forink/forink/global/config/Web3jConfig.java

@@ -4,12 +4,8 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.web3j.crypto.Credentials;
-import org.web3j.guideverification.GuideVerification;
 import org.web3j.protocol.Web3j;
 import org.web3j.protocol.http.HttpService;
-import org.web3j.tx.RawTransactionManager;
-import org.web3j.tx.TransactionManager;
-import org.web3j.tx.gas.DefaultGasProvider;
 
 @Configuration
 public class Web3jConfig {
@@ -44,4 +40,4 @@ public Credentials credentials() {
     //       new DefaultGasProvider()
     //   );
     // }
-}
+}

src/main/java/com/forink/forink/member/application/MemberService.java

@@ -1,11 +1,13 @@
 package com.forink.forink.member.application;
 
+import com.forink.forink.exam.entity.dao.ExamRepository;
 import com.forink.forink.global.security.dto.GoogleUserInfo;
 import com.forink.forink.global.security.util.GoogleClient;
 import com.forink.forink.global.security.util.JwtTokenProvider;
 import com.forink.forink.member.application.dto.response.OAuthLoginResponse;
 import com.forink.forink.member.entity.Member;
 import com.forink.forink.member.entity.dao.MemberRepository;
+import com.forink.forink.resume.entity.dao.ResumeRepository;
 import jakarta.transaction.Transactional;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -15,6 +17,8 @@
 public class MemberService {
 
     private final MemberRepository memberRepository;
+    private final ExamRepository examRepository;
+    private final ResumeRepository resumeRepository;
 
     private final MemberRegistrationService memberRegistrationService;
 
@@ -45,7 +49,13 @@ private OAuthLoginResponse loginExistingMember(final Member member) {
                 member.getMemberRoleType().name(),
                 member.getEmail()
         );
-        return OAuthLoginResponse.from(token, member);
+        return OAuthLoginResponse.from(token, member, checkIsCompletedExamOrResume(member));
+    }
+
+    private boolean checkIsCompletedExamOrResume(final Member member){
+        boolean hasExam = examRepository.existsByMember(member);
+        boolean hasResume = resumeRepository.existsByMember(member);
+        return hasExam || hasResume;
     }
 
 }

src/main/java/com/forink/forink/member/application/dto/response/OAuthLoginResponse.java

@@ -22,16 +22,20 @@ public record OAuthLoginResponse(
         String name,
 
         @NotNull
-        MemberRoleType role
+        MemberRoleType role,
+
+        @NotBlank
+        boolean isCompleted
 ) {
 
-    public static OAuthLoginResponse from(String token, Member member) {
+    public static OAuthLoginResponse from(String token, Member member, boolean isCompleted) {
         return OAuthLoginResponse.builder()
                 .token(token)
                 .memberId(member.getId())
                 .email(member.getEmail())
                 .name(member.getName())
                 .role(member.getMemberRoleType())
+                .isCompleted(isCompleted)
                 .build();
     }
 

src/main/java/com/forink/forink/resume/entity/dao/ResumeRepository.java

@@ -1,5 +1,6 @@
 package com.forink.forink.resume.entity.dao;
 
+import com.forink.forink.member.entity.Member;
 import com.forink.forink.member.entity.MemberRoleType;
 import com.forink.forink.resume.entity.Resume;
 import java.util.List;
@@ -13,4 +14,6 @@ public interface ResumeRepository extends JpaRepository<Resume, Long> {
 
     @EntityGraph(attributePaths = {"member"})
     List<Resume> findAllByMember_MemberRoleType(MemberRoleType memberMemberRoleType);
+
+    boolean existsByMember(final Member member);
 }

src/main/java/com/forink/forink/roadmap/application/RoadmapService.java

@@ -187,6 +187,7 @@ private List<RoadmapTypeDetailResponse> getRoadmapTypeInfos(final Roadmap roadma
     }
 
     private void saveRoadmaps(final AiRoadmapGenerateResponse[] aiResponses, final Member member) {
+        if (aiResponses == null || aiResponses.length == 0) return;
         final List<Roadmap> roadmaps = Arrays.stream(aiResponses)
                 .map(ai -> {
                     final RoadmapType type = RoadmapType.valueOf(ai.type());
@@ -204,6 +205,7 @@ private void saveRoadmaps(final AiRoadmapGenerateResponse[] aiResponses, final M
                                 .title(aiStep.stepTitle())
                                 .description(aiStep.stepDescription())
                                 .build();
+                        roadmap.addStep(step);
 
                         aiStep.contents().forEach(aiContent -> {
                             final RoadmapStepContent content = RoadmapStepContent.builder()
@@ -212,7 +214,6 @@ private void saveRoadmaps(final AiRoadmapGenerateResponse[] aiResponses, final M
                                     .build();
                             step.addContent(content);
                         });
-                        roadmap.addStep(step);
                     });
                     return roadmap;
                 }).toList();

src/main/java/com/forink/forink/roadmap/entity/Roadmap.java

@@ -72,6 +72,7 @@ public boolean isNotMine(final Member member) {
     }
 
     public void addStep(final RoadmapStep step) {
-        this.steps.add(step);
+        steps.add(step);
+        step.setRoadmap(this);
     }
 }

src/main/java/com/forink/forink/roadmap/entity/RoadmapStep.java

@@ -56,6 +56,11 @@ private RoadmapStep(final Roadmap roadmap, final Integer stepNumber, final Strin
     }
 
     public void addContent(final RoadmapStepContent content) {
-        this.roadmapStepContents.add(content);
+        roadmapStepContents.add(content);
+        content.setRoadmapStep(this);
+    }
+
+    void setRoadmap(final Roadmap roadmap){
+        this.roadmap = roadmap;
     }
 }

src/main/java/com/forink/forink/roadmap/entity/RoadmapStepContent.java

@@ -45,4 +45,8 @@ private RoadmapStepContent(final RoadmapStep roadmapStep, final String content)
     public void updateIsChecked() {
         this.isChecked = (this.isChecked == null) ? TRUE : !this.isChecked;
     }
+
+    public void setRoadmapStep(final RoadmapStep step){
+        this.roadmapStep = step;
+    }
 }