fix: remove dependency between api and jms modules

Author: EmmanuelDemey

listener-jms/pom.xml

@@ -17,12 +17,6 @@
     </properties>
 
     <dependencies>
-        <dependency>
-            <groupId>fr.insee.pearljam</groupId>
-            <artifactId>api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
@@ -103,6 +97,22 @@
             <optional>true</optional>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.liquibase</groupId>
+            <artifactId>liquibase-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-docker-compose</artifactId>
@@ -119,6 +129,33 @@
                 <artifactId>maven-install-plugin</artifactId>
                 <version>3.1.1</version>
             </plugin>
+            <!-- Copy Liquibase files from API module for tests -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>3.3.1</version>
+                <executions>
+                    <execution>
+                        <id>copy-liquibase-resources</id>
+                        <phase>process-test-resources</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.testOutputDirectory}/db</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>${project.basedir}/../api/src/main/resources/db</directory>
+                                    <includes>
+                                        <include>**/*.xml</include>
+                                        <include>**/*.sql</include>
+                                    </includes>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>

listener-jms/src/main/java/fr/insee/pearljam/JMSApplication.java

@@ -2,22 +2,23 @@
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.domain.EntityScan;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.context.event.ApplicationReadyEvent;
 import org.springframework.boot.context.properties.ConfigurationPropertiesScan;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.context.event.EventListener;
+import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import org.springframework.jms.annotation.EnableJms;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
-@SpringBootApplication(scanBasePackages = {
-        "fr.insee.pearljam.jms",
-        "fr.insee.pearljam.infrastructure.db.events"
-})
+@SpringBootApplication()
 @EnableTransactionManagement
 @ConfigurationPropertiesScan
 @EnableCaching
 @EnableJms
+@EntityScan(basePackages = "fr.insee.pearljam.jms.infrastructure.db")
+@EnableJpaRepositories(basePackages = "fr.insee.pearljam.jms.infrastructure.db")
 @Slf4j
 public class JMSApplication {
 

listener-jms/src/main/java/fr/insee/pearljam/jms/infrastructure/db/events/InboxDB.java

@@ -0,0 +1,41 @@
+package fr.insee.pearljam.jms.infrastructure.db.events;
+
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import org.hibernate.annotations.CreationTimestamp;
+import org.hibernate.annotations.JdbcTypeCode;
+import org.hibernate.type.SqlTypes;
+
+import java.time.LocalDateTime;
+import java.util.UUID;
+
+@Entity
+@Table(name = "inbox")
+@Getter
+@Setter
+@NoArgsConstructor
+public class InboxDB {
+    @Id
+    @Column(length = 50)
+    private UUID id;
+
+    @JdbcTypeCode(SqlTypes.JSON)
+    @Column(columnDefinition = "jsonb")
+    private ObjectNode payload;
+
+    @CreationTimestamp
+    @Column(name = "created_date", nullable = false, updatable = false)
+    private LocalDateTime createdDate;
+
+    public InboxDB(UUID id, ObjectNode payload) {
+        super();
+        this.id = id;
+        this.payload = payload;
+    }
+}

listener-jms/src/main/java/fr/insee/pearljam/jms/infrastructure/db/events/InboxJpaRepository.java

@@ -0,0 +1,15 @@
+package fr.insee.pearljam.jms.infrastructure.db.events;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.UUID;
+
+@Repository
+public interface InboxJpaRepository extends JpaRepository<InboxDB, UUID> {
+
+    @Query("SELECT i FROM InboxDB i ORDER BY i.createdDate ASC")
+    List<InboxDB> findAllOrderByCreatedDate();
+}

listener-jms/src/main/java/fr/insee/pearljam/jms/service/MultimodeSubscriber.java

@@ -1,11 +1,10 @@
 package fr.insee.pearljam.jms.service;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ObjectNode;
 import fr.insee.modelefiliere.EventDto;
-import fr.insee.pearljam.infrastructure.db.events.InboxDB;
-import fr.insee.pearljam.infrastructure.db.events.InboxJpaRepository;
 import fr.insee.pearljam.jms.configuration.MultimodeProperties;
+import fr.insee.pearljam.jms.infrastructure.db.events.InboxDB;
+import fr.insee.pearljam.jms.infrastructure.db.events.InboxJpaRepository;
 import jakarta.jms.JMSException;
 import jakarta.jms.Message;
 import lombok.RequiredArgsConstructor;

listener-jms/src/test/java/fr/insee/pearljam/jms/integration/MultimodeSubscriberIntegrationTest.java

@@ -3,8 +3,8 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import fr.insee.modelefiliere.EventDto;
 import fr.insee.pearljam.JMSApplication;
-import fr.insee.pearljam.infrastructure.db.events.InboxDB;
-import fr.insee.pearljam.infrastructure.db.events.InboxJpaRepository;
+import fr.insee.pearljam.jms.infrastructure.db.events.InboxDB;
+import fr.insee.pearljam.jms.infrastructure.db.events.InboxJpaRepository;
 import jakarta.jms.ConnectionFactory;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;