Develop back core -> develop_back로 머지

.gitignore

@@ -1 +1,3 @@
-.idea
+.idea
+
+backend/data

backend/core/build.gradle

@@ -50,6 +50,7 @@ dependencies {
     //redis
     implementation 'org.springframework.data:spring-data-redis'
     implementation 'io.lettuce:lettuce-core:6.3.0.RELEASE'
+    implementation 'org.redisson:redisson-spring-boot-starter:3.30.0'
 
     //RabbitMQ
     implementation 'org.springframework.boot:spring-boot-starter-amqp'
@@ -74,9 +75,6 @@ dependencies {
     //aop
     implementation 'org.springframework.boot:spring-boot-starter-aop'
 
-    //jnanoid
-    implementation 'com.aventrix.jnanoid:jnanoid:2.0.0'
-
     compileOnly 'org.projectlombok:lombok'
     runtimeOnly 'com.mysql:mysql-connector-j'
     annotationProcessor 'org.projectlombok:lombok'
@@ -88,6 +86,7 @@ dependencies {
     testImplementation 'org.testcontainers:testcontainers:1.19.1'
     testImplementation 'org.testcontainers:junit-jupiter:1.19.1'
     testImplementation 'org.testcontainers:mysql:1.19.1'
+    testImplementation 'com.redis:testcontainers-redis:2.2.2'
 }
 
 tasks.named('test') {

backend/core/src/main/java/site/timecapsulearchive/core/domain/auth/service/MessageVerificationService.java

@@ -3,6 +3,7 @@
 import java.nio.charset.StandardCharsets;
 import java.security.SecureRandom;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import site.timecapsulearchive.core.domain.auth.data.response.TokenResponse;
@@ -20,6 +21,7 @@
 import site.timecapsulearchive.core.infra.sms.data.response.SmsApiResponse;
 import site.timecapsulearchive.core.infra.sms.manager.SmsApiManager;
 
+@Slf4j
 @Service
 @Transactional
 @RequiredArgsConstructor
@@ -109,6 +111,14 @@ private Long updateToVerifiedMember(final Long memberId, final byte[] plain) {
 
         memberTemporaryRepository.delete(memberTemporary);
 
+        boolean isDuplicateTag = memberRepository.checkTagDuplication(memberTemporary.getTag());
+        if (isDuplicateTag) {
+            log.warn("member tag duplicate - email:{}, tag:{}", memberTemporary.getEmail(),
+                memberTemporary.getTag());
+            memberTemporary.updateTagLowerCaseSocialType();
+            log.warn("member tag update - tag: {}", memberTemporary.getTag());
+        }
+
         final Member verifiedMember = memberTemporary.toMember(hashEncryptionManager.encrypt(plain),
             aesEncryptionManager.encryptWithPrefixIV(plain));
 

backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/group_capsule/data/dto/MyGroupCapsuleDto.java → backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/data/dto/CapsuleBasicInfoDto.java

@@ -1,11 +1,11 @@
-package site.timecapsulearchive.core.domain.capsule.group_capsule.data.dto;
+package site.timecapsulearchive.core.domain.capsule.data.dto;
 
 import java.time.ZonedDateTime;
 import java.util.function.Function;
+import site.timecapsulearchive.core.domain.capsule.data.response.CapsuleBasicInfoResponse;
 import site.timecapsulearchive.core.domain.capsule.entity.CapsuleType;
-import site.timecapsulearchive.core.domain.capsule.group_capsule.data.response.MyGroupCapsuleResponse;
 
-public record MyGroupCapsuleDto(
+public record CapsuleBasicInfoDto(
     Long capsuleId,
     String skinUrl,
     ZonedDateTime dueDate,
@@ -15,9 +15,9 @@ public record MyGroupCapsuleDto(
     CapsuleType capsuleType
 ) {
 
-    public MyGroupCapsuleResponse toResponse(
+    public CapsuleBasicInfoResponse toResponse(
         final Function<String, String> singlePreSignUrlFunction) {
-        return MyGroupCapsuleResponse.builder()
+        return CapsuleBasicInfoResponse.builder()
             .capsuleId(capsuleId)
             .skinUrl(singlePreSignUrlFunction.apply(skinUrl))
             .dueDate(dueDate)
@@ -27,4 +27,4 @@ public MyGroupCapsuleResponse toResponse(
             .capsuleType(capsuleType)
             .build();
     }
-}
+}

backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/group_capsule/data/response/MyGroupCapsuleResponse.java → backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/data/response/CapsuleBasicInfoResponse.java

@@ -1,4 +1,4 @@
-package site.timecapsulearchive.core.domain.capsule.group_capsule.data.response;
+package site.timecapsulearchive.core.domain.capsule.data.response;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import java.time.ZonedDateTime;
@@ -7,8 +7,8 @@
 import site.timecapsulearchive.core.global.common.response.ResponseMappingConstant;
 
 @Builder
-@Schema(description = "사용자가 만든 그룹 캡슐")
-public record MyGroupCapsuleResponse(
+@Schema(description = "캡슐 기본 정보")
+public record CapsuleBasicInfoResponse(
 
     @Schema(description = "캡슐 아이디")
     Long capsuleId,
@@ -32,7 +32,7 @@ public record MyGroupCapsuleResponse(
     CapsuleType capsuleType
 ) {
 
-    public MyGroupCapsuleResponse {
+    public CapsuleBasicInfoResponse {
         if (dueDate != null) {
             dueDate = dueDate.withZoneSameInstant(ResponseMappingConstant.ZONE_ID);
         }
@@ -41,4 +41,4 @@ public record MyGroupCapsuleResponse(
             createdAt = createdAt.withZoneSameInstant(ResponseMappingConstant.ZONE_ID);
         }
     }
-}
+}

backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/entity/Capsule.java

@@ -15,15 +15,18 @@
 import jakarta.persistence.OneToMany;
 import jakarta.persistence.Table;
 import java.time.ZonedDateTime;
+import java.util.ArrayList;
 import java.util.List;
 import lombok.AccessLevel;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import org.locationtech.jts.geom.Point;
+import site.timecapsulearchive.core.domain.capsule.exception.GroupCapsuleOpenNotFoundException;
 import site.timecapsulearchive.core.domain.capsuleskin.entity.CapsuleSkin;
 import site.timecapsulearchive.core.domain.group.entity.Group;
 import site.timecapsulearchive.core.domain.member.entity.Member;
+import site.timecapsulearchive.core.global.common.supplier.ZonedDateTimeSupplier;
 import site.timecapsulearchive.core.global.entity.BaseEntity;
 
 @Entity
@@ -60,13 +63,13 @@ public class Capsule extends BaseEntity {
     private Address address;
 
     @OneToMany(mappedBy = "capsule", cascade = CascadeType.ALL, orphanRemoval = true)
-    private List<Image> images;
+    private final List<Image> images = new ArrayList<>();
 
     @OneToMany(mappedBy = "capsule", cascade = CascadeType.ALL, orphanRemoval = true)
-    private List<Video> videos;
+    private final List<Video> videos = new ArrayList<>();
 
     @OneToMany(mappedBy = "capsule", cascade = CascadeType.ALL, orphanRemoval = true)
-    private List<GroupCapsuleOpen> groupCapsuleOpens;
+    private final List<GroupCapsuleOpen> groupCapsuleOpens = new ArrayList<>();
 
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "group_id")
@@ -109,6 +112,31 @@ public boolean isNotCapsuleOpened() {
             return false;
         }
 
-        return dueDate.isAfter(ZonedDateTime.now());
+        return dueDate.isAfter(ZonedDateTimeSupplier.utc().get());
+    }
+
+    public void open() {
+        this.isOpened = Boolean.TRUE;
+    }
+
+    public boolean isNotTimeCapsule() {
+        return dueDate == null;
+    }
+
+    public boolean isAllGroupMemberOpened(Long memberId, Long capsuleId) {
+        if (groupCapsuleOpens.isEmpty()) {
+            throw new GroupCapsuleOpenNotFoundException();
+        }
+
+        boolean isCapsuleOpened = true;
+        for (GroupCapsuleOpen groupCapsuleOpen : groupCapsuleOpens) {
+            if (groupCapsuleOpen.matched(capsuleId, memberId)) {
+                groupCapsuleOpen.open();
+            }
+
+            isCapsuleOpened = isCapsuleOpened && groupCapsuleOpen.getIsOpened();
+        }
+
+        return isCapsuleOpened;
     }
 }

backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/entity/CapsuleType.java

@@ -4,5 +4,6 @@ public enum CapsuleType {
     SECRET,
     PUBLIC,
     GROUP,
+    TREASURE,
     ALL
 }

backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/entity/GroupCapsuleOpen.java

@@ -9,11 +9,10 @@
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.Table;
-import java.util.Objects;
 import lombok.AccessLevel;
-import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import site.timecapsulearchive.core.domain.group.entity.Group;
 import site.timecapsulearchive.core.domain.member.entity.Member;
 import site.timecapsulearchive.core.global.entity.BaseEntity;
 
@@ -39,10 +38,15 @@ public class GroupCapsuleOpen extends BaseEntity {
     @JoinColumn(name = "member_id", nullable = false)
     private Member member;
 
-    @Builder
-    private GroupCapsuleOpen(Boolean isOpened, Capsule capsule, Member member) {
-        this.isOpened = Objects.requireNonNull(isOpened);
-        this.capsule = Objects.requireNonNull(capsule);
-        this.member = Objects.requireNonNull(member);
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "group_id", nullable = false)
+    private Group group;
+
+    public void open() {
+        this.isOpened = Boolean.TRUE;
+    }
+
+    public boolean matched(Long capsuleId, Long memberId) {
+        return capsule.getId().equals(capsuleId) && member.getId().equals(memberId);
     }
 }

backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/exception/GroupCapsuleOpenNotFoundException.java

@@ -0,0 +1,11 @@
+package site.timecapsulearchive.core.domain.capsule.exception;
+
+import site.timecapsulearchive.core.global.error.ErrorCode;
+import site.timecapsulearchive.core.global.error.exception.BusinessException;
+
+public class GroupCapsuleOpenNotFoundException extends BusinessException {
+
+    public GroupCapsuleOpenNotFoundException() {
+        super(ErrorCode.GROUP_CAPSULE_OPEN_NOT_FOUND_ERROR);
+    }
+}

backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/data/response/NearbyARCapsuleSummaryResponse.java

@@ -34,6 +34,7 @@ public record NearbyARCapsuleSummaryResponse(
     @Schema(description = "캡슐 타입")
     CapsuleType capsuleType
 ) {
+
     public NearbyARCapsuleSummaryResponse {
         if (dueDate != null) {
             dueDate = dueDate.withZoneSameInstant(ResponseMappingConstant.ZONE_ID);

backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/capsule/CapsuleQueryRepository.java

@@ -0,0 +1,36 @@
+package site.timecapsulearchive.core.domain.capsule.generic_capsule.repository.capsule;
+
+import java.util.List;
+import java.util.Optional;
+import org.locationtech.jts.geom.Polygon;
+import site.timecapsulearchive.core.domain.capsule.entity.CapsuleType;
+import site.timecapsulearchive.core.domain.capsule.generic_capsule.data.dto.NearbyARCapsuleSummaryDto;
+import site.timecapsulearchive.core.domain.capsule.generic_capsule.data.dto.NearbyCapsuleSummaryDto;
+import site.timecapsulearchive.core.domain.capsule.treasure_capsule.data.dto.TreasureCapsuleSummaryDto;
+
+public interface CapsuleQueryRepository {
+
+    List<NearbyARCapsuleSummaryDto> findARCapsuleSummaryDtosByCurrentLocationAndCapsuleType(
+        final Long memberId,
+        final Polygon mbr,
+        final CapsuleType capsuleType
+    );
+
+    List<NearbyCapsuleSummaryDto> findCapsuleSummaryDtosByCurrentLocationAndCapsuleType(
+        final Long memberId,
+        final Polygon mbr,
+        final CapsuleType capsuleType
+    );
+
+    List<NearbyCapsuleSummaryDto> findFriendsCapsuleSummaryDtosByCurrentLocationAndCapsuleType(
+        final List<Long> friendIds,
+        final Polygon mbr
+    );
+
+    List<NearbyARCapsuleSummaryDto> findFriendsARCapsulesByCurrentLocation(
+        final List<Long> friendIds,
+        final Polygon mbr
+    );
+
+    Optional<TreasureCapsuleSummaryDto> findTreasureCapsuleSummary(final Long capsuleId);
+}