Fix duplicate login errors.

Signed-off-by: Han Kyuhyun <[email protected]> Co-authored-by: Jongmin Lee <[email protected]> Co-authored-by: June Saehwan <[email protected]> Co-authored-by: ByunJeongHeum <[email protected]>
Samsung · Sep 15, 2023 · 81f3ad5 · 81f3ad5
1 parent b818268
commit 81f3ad5
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/src/main/java/com/lpvs/entity/LPVSMember.java b/src/main/java/com/lpvs/entity/LPVSMember.java
@@ -17,7 +17,7 @@
 @Getter @NoArgsConstructor
 @DynamicUpdate
 @Entity
-@Table(name = "member")
+@Table(name = "member", uniqueConstraints = @UniqueConstraint(columnNames = {"email", "provider"}))
 public class LPVSMember {
 
     @Id

diff --git a/src/main/java/com/lpvs/service/LPVSLoginCheckService.java b/src/main/java/com/lpvs/service/LPVSLoginCheckService.java
@@ -58,10 +58,17 @@ public LPVSMember getMemberFromMemberMap(Authentication authentication) {
         if (findMemberOptional.isPresent()) {
             return findMemberOptional.get();
         } else {
-            LPVSMember newMember = new LPVSMember();
-            newMember.setJoin(name, email, provider);
-            memberRepository.save(newMember);
-            return newMember;
+            synchronized (this) {
+                findMemberOptional = memberRepository.findByEmailAndProvider(email, provider);
+                if (findMemberOptional.isPresent()) {
+                    return findMemberOptional.get();
+                } else {
+                    LPVSMember newMember = new LPVSMember();
+                    newMember.setJoin(name, email, provider);
+                    memberRepository.save(newMember);
+                    return newMember;
+                }
+            }
         }
     }
 }