configuration(dependency) mongodb

MongoDB 의존성 제거
VotePaper, VoteChoice, Vote Entity JPA 영속성 모델로 변경

Author: habinkim

build.gradle

@@ -75,12 +75,9 @@ dependencies {
 
     // Persistence Layer
     implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
-    implementation 'org.springframework.boot:spring-boot-starter-data-mongodb'
     implementation 'org.springframework.boot:spring-boot-starter-data-redis'
+    implementation 'io.hypersistence:hypersistence-utils-hibernate-63:3.7.4'
     implementation "io.github.openfeign.querydsl:querydsl-jpa-spring:${queryDslVersion}"
-    implementation("io.github.openfeign.querydsl:querydsl-mongodb:${queryDslVersion}") {
-        exclude group: 'org.mongodb', module: 'mongo-java-driver'
-    }
     implementation "io.github.openfeign.querydsl:querydsl-collections:${queryDslVersion}"
     implementation 'com.github.gavlyukovskiy:p6spy-spring-boot-starter:1.9.1'
     implementation 'org.flywaydb:flyway-core'
@@ -137,8 +134,6 @@ dependencies {
     annotationProcessor(
             'org.springframework.boot:spring-boot-configuration-processor',
             "io.github.openfeign.querydsl:querydsl-jpa-spring:${queryDslVersion}",
-            "io.github.openfeign.querydsl:querydsl-mongodb:${queryDslVersion}",
-            'org.springframework.boot:spring-boot-starter-data-mongodb',
             'org.projectlombok:lombok',
             "org.mapstruct:mapstruct-processor:${mapstructVersion}",
             'org.projectlombok:lombok-mapstruct-binding:0.2.0'
@@ -171,16 +166,13 @@ dependencies {
     testImplementation 'org.springframework.boot:spring-boot-testcontainers'
     testImplementation 'org.testcontainers:junit-jupiter'
     testImplementation 'org.testcontainers:postgresql'
-    testImplementation 'org.testcontainers:mongodb'
     testImplementation 'org.testcontainers:kafka'
     testImplementation 'org.testcontainers:localstack'
     testImplementation 'org.elasticmq:elasticmq-server_3:1.6.1'
 
     testAnnotationProcessor(
             'org.springframework.boot:spring-boot-configuration-processor',
             "io.github.openfeign.querydsl:querydsl-jpa-spring:${queryDslVersion}",
-            "io.github.openfeign.querydsl:querydsl-mongodb:${queryDslVersion}",
-            'org.springframework.boot:spring-boot-starter-data-mongodb',
             'org.projectlombok:lombok',
             "org.mapstruct:mapstruct-processor:${mapstructVersion}",
             'org.projectlombok:lombok-mapstruct-binding:0.2.0'
@@ -193,13 +185,6 @@ sourceSets {
 }
 
 tasks.withType(JavaCompile).configureEach {
-    options.compilerArgs += [
-            "-processor", 'lombok.launch.AnnotationProcessorHider$AnnotationProcessor,' +
-            'org.springframework.data.mongodb.repository.support.MongoAnnotationProcessor,' +
-            'com.querydsl.apt.jpa.JPAAnnotationProcessor,' +
-            'org.mapstruct.ap.MappingProcessor,' +
-            'org.springframework.boot.configurationprocessor.ConfigurationMetadataAnnotationProcessor'
-    ]
     options.annotationProcessorGeneratedSourcesDirectory(file(generated))
 }
 

compose.yaml

@@ -14,15 +14,4 @@ services:
     container_name: 'tune_fun_redis'
     restart: always
     ports:
-      - '6378:6379'
-
-  mongodb:
-    image: 'mongo:7.0.4'
-    container_name: 'tune_fun_mongodb'
-    restart: always
-    environment:
-      MONGO_INITDB_DATABASE: mydatabase
-      MONGO_INITDB_ROOT_PASSWORD: secret
-      MONGO_INITDB_ROOT_USERNAME: root
-    ports:
-      - '27016:27017'
+      - '6378:6379'

src/docs/asciidoc/index.adoc

@@ -13,3 +13,4 @@ include::common/message.adoc[]
 include::account-api.adoc[]
 include::oauth2-api.adoc[]
 include::otp-api.adoc[]
+include::vote-api.adoc[]

src/docs/asciidoc/vote-api.adoc

@@ -0,0 +1,8 @@
+[[Vote-API]]
+== Vote API
+
+=== 투표 게시물 등록 API
+
+==== 성공
+
+operation::register-vote-paper-success[snippets='http-request,http-response,request-fields']

src/main/java/com/tune_fun/v1/account/adapter/input/rest/RegisterController.java

@@ -29,7 +29,7 @@ public class RegisterController {
      */
     @PostMapping(value = Uris.REGISTER)
     public ResponseEntity<Response<RegisterResult>> register(@RequestParam(name = "type") RegisterType type, @Valid @RequestBody final AccountCommands.Register command) {
-        RegisterResult registerResult = registerUseCase.register(type, command);
+        RegisterResult registerResult = registerUseCase.register(type.name(), command);
         return responseMapper.ok(registerResult);
     }
 

src/main/java/com/tune_fun/v1/account/application/port/input/usecase/RegisterUseCase.java

@@ -1,10 +1,9 @@
 package com.tune_fun.v1.account.application.port.input.usecase;
 
-import com.tune_fun.v1.account.adapter.input.rest.RegisterType;
 import com.tune_fun.v1.account.application.port.input.command.AccountCommands;
 import com.tune_fun.v1.account.domain.value.RegisterResult;
 
 @FunctionalInterface
 public interface RegisterUseCase {
-    RegisterResult register(RegisterType type, final AccountCommands.Register command);
+    RegisterResult register(String registerType, final AccountCommands.Register command);
 }

src/main/java/com/tune_fun/v1/account/application/service/RegisterService.java

@@ -1,6 +1,5 @@
 package com.tune_fun.v1.account.application.service;
 
-import com.tune_fun.v1.account.adapter.input.rest.RegisterType;
 import com.tune_fun.v1.account.application.port.input.command.AccountCommands;
 import com.tune_fun.v1.account.application.port.input.usecase.RegisterUseCase;
 import com.tune_fun.v1.account.application.port.output.LoadAccountPort;
@@ -36,8 +35,8 @@ public class RegisterService implements RegisterUseCase {
     private final PasswordEncoder passwordEncoder;
 
     @NotNull
-    private static SaveAccount getSaveAccount(final RegisterType type, final AccountCommands.Register command, final String encodedPassword) {
-        return new SaveAccount(type.name(),
+    private static SaveAccount getSaveAccount(final String registerType, final AccountCommands.Register command, final String encodedPassword) {
+        return new SaveAccount(registerType,
                 StringUtil.uuid(), command.username(), encodedPassword,
                 command.email(), command.nickname(), command.notification().voteDeliveryNotification(),
                 command.notification().voteEndNotification(), command.notification().voteDeliveryNotification()
@@ -51,11 +50,11 @@ private static RegisterResult getRegisterResult(CurrentAccount savedAccount, Str
 
     @Override
     @Transactional
-    public RegisterResult register(final RegisterType type, final AccountCommands.Register command) {
+    public RegisterResult register(final String registerType, final AccountCommands.Register command) {
         checkRegisterdAccount(command);
 
         String encodedPassword = passwordEncoder.encode(command.password());
-        SaveAccount saveAccount = getSaveAccount(type, command, encodedPassword);
+        SaveAccount saveAccount = getSaveAccount(registerType, command, encodedPassword);
         CurrentAccount savedAccount = saveAccountPort.saveAccount(saveAccount);
 
         String authorities = String.join(",", savedAccount.roles());

src/main/java/com/tune_fun/v1/common/config/SpringDataConfig.java

@@ -18,15 +18,13 @@ public class SqsProvider {
     private final SqsTemplate sqsTemplate;
     private final EventProperty eventProperty;
 
-    public SendResult<?> sendMessageRangedQueue(@NotBlank final String queueName, @NotBlank final String messageGroupId,
-                                                @NotNull final Object message) {
+    public SendResult<?> sendMessageRangedQueue(@NotBlank final String queueName, @NotNull final Object message) {
         EventProperty.SqsProducer sqsProducer = eventProperty.getSqsProducer(queueName);
 
         return sqsTemplate.send(to -> to
                 .queue(sqsProducer.queueName())
                 .header(CONTENT_TYPE, APPLICATION_JSON_VALUE)
                 .payload(message)
-                .messageGroupId(messageGroupId)
         );
     }
 

src/main/java/com/tune_fun/v1/external/aws/sqs/SqsProvider.java

@@ -16,7 +16,6 @@ public class VoteMessageBrokerAdapter implements ProduceVotePaperUploadEventPort
 
     @Override
     public void produceVotePaperUploadEvent(final ProduceVotePaperUploadEvent produceVotePaperUploadEvent) {
-        sqsProvider.sendMessageRangedQueue(VOTE_PAPER_UPLOAD_QUEUE, produceVotePaperUploadEvent.id() + "_fcm",
-                produceVotePaperUploadEvent);
+        sqsProvider.sendMessageRangedQueue(VOTE_PAPER_UPLOAD_QUEUE, produceVotePaperUploadEvent);
     }
 }

src/main/java/com/tune_fun/v1/vote/adapter/output/message/VoteMessageBrokerAdapter.java

@@ -1,20 +1,6 @@
 package com.tune_fun.v1.vote.adapter.output.persistence;
 
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-
 import java.util.Set;
 
-@Builder
-@Getter
-@AllArgsConstructor
-@NoArgsConstructor
-public final class Offer {
-    private String name;
-    private String artistName;
-    private Set<String> genres;
-    private String releaseDate;
-    private Integer durationMs;
+public record Offer(String music, String artistName, Set<String> genres, String releaseDate, Integer durationMs) {
 }

src/main/java/com/tune_fun/v1/vote/adapter/output/persistence/Offer.java

@@ -0,0 +1,44 @@
+package com.tune_fun.v1.vote.adapter.output.persistence;
+
+import com.tune_fun.v1.common.entity.BaseEntity;
+import jakarta.persistence.*;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+import org.hibernate.annotations.Comment;
+import org.hibernate.annotations.JdbcTypeCode;
+import org.hibernate.type.SqlTypes;
+
+@SuperBuilder(toBuilder = true)
+@NoArgsConstructor
+@AllArgsConstructor
+@Getter
+@Entity
+@Table(name = "vote_choice")
+public class VoteChoiceJpaEntity extends BaseEntity {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id", nullable = false, updatable = false)
+    @Comment("Sequence")
+    private Long id;
+
+    @Size(max = 255)
+    @NotNull
+    @Column(name = "uuid", nullable = false)
+    @Comment("고유번호")
+    private String uuid;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "vote_paper_id", nullable = false, updatable = false, referencedColumnName = "id")
+    @Comment("투표 게시물 ID")
+    private VotePaperJpaEntity votePaper;
+
+    @JdbcTypeCode(SqlTypes.JSON)
+    @Comment("선택지 제안사항")
+    private Offer offer;
+
+}

src/main/java/com/tune_fun/v1/vote/adapter/output/persistence/VoteChoiceJpaEntity.java

@@ -1,6 +1,6 @@
 package com.tune_fun.v1.vote.adapter.output.persistence;
 
-import org.springframework.data.mongodb.repository.MongoRepository;
+import org.springframework.data.jpa.repository.JpaRepository;
 
-public interface VoteChoiceRepository extends MongoRepository<VoteChoiceMongoEntity, String> {
+public interface VoteChoiceRepository extends JpaRepository<VoteChoiceJpaEntity, String> {
 }

src/main/java/com/tune_fun/v1/vote/adapter/output/persistence/VoteChoiceMongoEntity.java

@@ -0,0 +1,44 @@
+package com.tune_fun.v1.vote.adapter.output.persistence;
+
+import com.tune_fun.v1.account.adapter.output.persistence.AccountJpaEntity;
+import com.tune_fun.v1.common.entity.BaseEntity;
+import jakarta.persistence.*;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+import org.hibernate.annotations.Comment;
+
+@SuperBuilder(toBuilder = true)
+@NoArgsConstructor
+@AllArgsConstructor
+@Getter
+@Entity
+@Table(name = "vote")
+public class VoteJpaEntity extends BaseEntity {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id", nullable = false, updatable = false)
+    @Comment("Sequence")
+    private Long id;
+
+    @Size(max = 255)
+    @NotNull
+    @Column(name = "uuid", nullable = false)
+    @Comment("고유번호")
+    private String uuid;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "vote_choice_id", nullable = false, updatable = false, referencedColumnName = "id")
+    @Comment("투표 선택지 ID")
+    private VoteChoiceJpaEntity voteChoice;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "voter_id", nullable = false, updatable = false, referencedColumnName = "id")
+    @Comment("투표자 ID")
+    private AccountJpaEntity voter;
+
+}