Merge branch 'develop_back_core' into feat/group_accept_B-#414

tukcomCD2024 · May 14, 2024 · bfeeacb · bfeeacb
2 parents c3f7609 + 22e6de2
commit bfeeacb
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 10 deletions.
diff --git a/...ain/java/site/timecapsulearchive/core/domain/auth/service/MessageVerificationService.java b/...ain/java/site/timecapsulearchive/core/domain/auth/service/MessageVerificationService.java
@@ -93,25 +93,27 @@ public TokenResponse validVerificationMessage(
             throw new CertificationNumberNotMatchException();
         }
 
-        updateToVerifiedMember(memberId, plain);
+        final Long verifiedMemberId = updateToVerifiedMember(memberId, plain);
 
-        return tokenManager.createNewToken(memberId);
+        return tokenManager.createNewToken(verifiedMemberId);
     }
 
     private boolean isNotMatch(final String certificationNumber,
         final String findCertificationNumber) {
         return !certificationNumber.equals(findCertificationNumber);
     }
 
-    private void updateToVerifiedMember(final Long memberId, final byte[] plain) {
+    private Long updateToVerifiedMember(final Long memberId, final byte[] plain) {
         final MemberTemporary memberTemporary = memberTemporaryRepository.findById(memberId)
             .orElseThrow(MemberNotFoundException::new);
 
         memberTemporaryRepository.delete(memberTemporary);
 
-        final Member member = memberTemporary.toMember(hashEncryptionManager.encrypt(plain),
+        final Member verifiedMember = memberTemporary.toMember(hashEncryptionManager.encrypt(plain),
             aesEncryptionManager.encryptWithPrefixIV(plain));
 
-        memberRepository.save(member);
+        memberRepository.save(verifiedMember);
+
+        return verifiedMember.getId();
     }
 }
diff --git a/...capsulearchive/core/domain/capsule/generic_capsule/repository/CapsuleQueryRepository.java b/...capsulearchive/core/domain/capsule/generic_capsule/repository/CapsuleQueryRepository.java
@@ -56,8 +56,7 @@ public List<NearbyARCapsuleSummaryDto> findARCapsuleSummaryDtosByCurrentLocation
             .join(capsule.capsuleSkin, capsuleSkin)
             .join(capsule.member, member)
             .where(ST_Contains(mbr, capsule.point).and(capsule.member.id.eq(memberId)
-                    .and(eqCapsuleType(capsuleType)))
-                .and(capsule.type.eq(CapsuleType.PUBLIC)))
+                    .and(eqCapsuleType(capsuleType))))
             .fetch();
     }
 

diff --git a/backend/core/src/main/resources/config b/backend/core/src/main/resources/config
diff --git a/...ulearchive/core/domain/capsule/generic_capsule/repository/CapsuleQueryRepositoryTest.java b/...ulearchive/core/domain/capsule/generic_capsule/repository/CapsuleQueryRepositoryTest.java
@@ -134,6 +134,7 @@ void setup(@Autowired EntityManager entityManager) {
 
         //then
         SoftAssertions.assertSoftly(softly -> {
+            assertThat(capsules).isNotEmpty();
             assertThat(capsules).allMatch(c -> c.capsuleType().equals(capsuleType));
             assertThat(capsules).allMatch(c -> myCapsuleIds.contains(c.id()));
             assertThat(capsules).allMatch(c -> mbr.contains(c.point()));
@@ -153,6 +154,7 @@ void setup(@Autowired EntityManager entityManager) {
 
         //then
         SoftAssertions.assertSoftly(softly -> {
+            assertThat(capsules).isNotEmpty();
             assertThat(capsules).allMatch(c -> c.capsuleType().equals(capsuleType));
             assertThat(capsules).allMatch(c -> myCapsuleIds.contains(c.id()));
             assertThat(capsules).allMatch(c -> mbr.contains(c.point()));
@@ -172,6 +174,7 @@ void setup(@Autowired EntityManager entityManager) {
 
         //then
         SoftAssertions.assertSoftly(softly -> {
+            assertThat(capsules).isNotEmpty();
             assertThat(capsules).allMatch(c -> c.capsuleType().equals(capsuleType));
             assertThat(capsules).allMatch(c -> myCapsuleIds.contains(c.id()));
             assertThat(capsules).allMatch(c -> mbr.contains(c.point()));
@@ -191,6 +194,7 @@ void setup(@Autowired EntityManager entityManager) {
 
         //then
         SoftAssertions.assertSoftly(softly -> {
+            assertThat(capsules).isNotEmpty();
             assertThat(capsules).allMatch(c -> c.capsuleType().equals(capsuleType));
             assertThat(capsules).allMatch(c -> myCapsuleIds.contains(c.id()));
             assertThat(capsules).allMatch(c -> mbr.contains(c.point()));
@@ -210,6 +214,7 @@ void setup(@Autowired EntityManager entityManager) {
 
         //then
         SoftAssertions.assertSoftly(softly -> {
+            assertThat(capsules).isNotEmpty();
             assertThat(capsules).allMatch(
                 c -> c.capsuleType().equals(CapsuleType.PUBLIC) ||
                     c.capsuleType().equals(CapsuleType.SECRET) ||
@@ -233,6 +238,7 @@ void setup(@Autowired EntityManager entityManager) {
 
         //then
         SoftAssertions.assertSoftly(softly -> {
+            assertThat(capsules).isNotEmpty();
             assertThat(capsules).allMatch(
                 c -> c.capsuleType().equals(CapsuleType.PUBLIC) ||
                     c.capsuleType().equals(CapsuleType.SECRET) ||
@@ -255,6 +261,7 @@ void setup(@Autowired EntityManager entityManager) {
 
         //then
         SoftAssertions.assertSoftly(softly -> {
+            assertThat(capsules).isNotEmpty();
             assertThat(capsules).allMatch(c -> friendCapsuleIds.contains(c.id()));
             assertThat(capsules).allMatch(c -> c.capsuleType().equals(CapsuleType.PUBLIC));
             assertThat(capsules).allMatch(c -> mbr.contains(c.point()));
@@ -268,11 +275,12 @@ void setup(@Autowired EntityManager entityManager) {
 
         //when
         List<NearbyARCapsuleSummaryDto> capsules = capsuleQueryRepository.findFriendsARCapsulesByCurrentLocation(
-            friendCapsuleIds, mbr
+            friendIds, mbr
         );
 
         //then
         SoftAssertions.assertSoftly(softly -> {
+            assertThat(capsules).isNotEmpty();
             assertThat(capsules).allMatch(c -> friendCapsuleIds.contains(c.id()));
             assertThat(capsules).allMatch(c -> c.capsuleType().equals(CapsuleType.PUBLIC));
             assertThat(capsules).allMatch(c -> mbr.contains(c.point()));

diff --git a/backend/notification/src/main/resources/config b/backend/notification/src/main/resources/config