32810 update dina base and search messaging (#24)

* 32810 Update dina-base and search-messaging
Updated dina-base and related code

* Update application.yml
Removed legacy content

* Fixed FallbackMessageProducer

pom.xml

@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>2.7.7</version>
+    <version>2.7.18</version>
   </parent>
 
   <properties>
@@ -25,7 +25,7 @@
     <jacoco-maven-plugin.version>0.8.8</jacoco-maven-plugin.version>
     <maven-checkstyle-plugin.version>3.1.2</maven-checkstyle-plugin.version>
     <checkstyle.version>8.45.1</checkstyle.version>
-    <dina-base-api.version>0.100</dina-base-api.version>
+    <dina-base-api.version>0.115</dina-base-api.version>
     <postgresql.version>42.4.1</postgresql.version>
     <spring-boot-maven-plugin.fork>false</spring-boot-maven-plugin.fork>
   </properties>

src/main/java/ca/gc/aafc/transaction/api/MainConfiguration.java

@@ -40,7 +40,7 @@ public void setupManagedAttributeLookup(ResourceRegistry resourceRegistry) {
   public static class FallbackMessageProducer {
 
     @Bean
-    @ConditionalOnProperty(name = "messaging.isProducer", havingValue = "false")
+    @ConditionalOnProperty(name = "dina.messaging.isProducer", havingValue = "false")
     public MessageProducer init() {
       return new LogBasedMessageProducer();
     }

src/main/java/ca/gc/aafc/transaction/api/entities/Transaction.java

@@ -25,11 +25,6 @@
 import org.hibernate.annotations.NaturalId;
 import org.hibernate.annotations.NaturalIdCache;
 import org.hibernate.annotations.Type;
-import org.hibernate.annotations.TypeDef;
-
-import com.vladmihalcea.hibernate.type.array.ListArrayType;
-import com.vladmihalcea.hibernate.type.basic.PostgreSQLEnumType;
-import com.vladmihalcea.hibernate.type.json.JsonBinaryType;
 
 import ca.gc.aafc.dina.entity.DinaEntity;
 import ca.gc.aafc.dina.service.OnUpdate;
@@ -49,9 +44,6 @@
 @ToString
 @Builder
 @NaturalIdCache
-@TypeDef(name = "jsonb", typeClass = JsonBinaryType.class)
-@TypeDef(name = "pgsql_enum", typeClass = PostgreSQLEnumType.class)
-@TypeDef(name = "list-array", typeClass = ListArrayType.class)
 public class Transaction implements DinaEntity {
 
   public enum Direction { IN, OUT }

src/main/java/ca/gc/aafc/transaction/api/entities/TransactionManagedAttribute.java

@@ -3,9 +3,8 @@
 import ca.gc.aafc.dina.entity.ManagedAttribute;
 import ca.gc.aafc.dina.i18n.MultilingualDescription;
 import ca.gc.aafc.dina.i18n.MultilingualTitle;
-import com.vladmihalcea.hibernate.type.array.StringArrayType;
-import com.vladmihalcea.hibernate.type.basic.PostgreSQLEnumType;
-import com.vladmihalcea.hibernate.type.json.JsonBinaryType;
+
+import javax.persistence.Transient;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
@@ -16,8 +15,6 @@
 import org.hibernate.annotations.NaturalId;
 import org.hibernate.annotations.NaturalIdCache;
 import org.hibernate.annotations.Type;
-import org.hibernate.annotations.TypeDef;
-import org.hibernate.annotations.TypeDefs;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -33,9 +30,6 @@
 import java.util.UUID;
 
 @Entity(name = "managed_attribute")
-@TypeDefs({@TypeDef(name = "pgsql_enum", typeClass = PostgreSQLEnumType.class),
-  @TypeDef(name = "string-array", typeClass = StringArrayType.class),
-  @TypeDef(name = "jsonb", typeClass = JsonBinaryType.class)})
 @AllArgsConstructor
 @Getter
 @Setter
@@ -94,6 +88,13 @@ public String getTerm() {
     return null;
   }
 
+  // not implemented for now
+  @Transient
+  @Override
+  public String getUnit() {
+    return null;
+  }
+
   @Override
   public MultilingualTitle getMultilingualTitle() {
     return null;

src/main/java/ca/gc/aafc/transaction/api/entities/package-info.java

@@ -0,0 +1,12 @@
+@TypeDef(name = "jsonb", typeClass = JsonBinaryType.class)
+@TypeDef(name = "string-array", typeClass = StringArrayType.class)
+@TypeDef(name = "list-array", typeClass = ListArrayType.class)
+@TypeDef(name = "pgsql_enum", typeClass = PostgreSQLEnumType.class)
+package ca.gc.aafc.transaction.api.entities;
+
+import io.hypersistence.utils.hibernate.type.array.ListArrayType;
+import io.hypersistence.utils.hibernate.type.array.StringArrayType;
+import io.hypersistence.utils.hibernate.type.basic.PostgreSQLEnumType;
+import io.hypersistence.utils.hibernate.type.json.JsonBinaryType;
+
+import org.hibernate.annotations.TypeDef;

src/main/java/ca/gc/aafc/transaction/api/repository/TransactionRepository.java

@@ -10,7 +10,7 @@
 import ca.gc.aafc.dina.repository.DinaRepository;
 import ca.gc.aafc.dina.repository.external.ExternalResourceProvider;
 import ca.gc.aafc.dina.security.DinaAuthenticatedUser;
-import ca.gc.aafc.dina.security.GroupAuthorizationService;
+import ca.gc.aafc.dina.security.auth.GroupAuthorizationService;
 import ca.gc.aafc.dina.service.AuditService;
 import ca.gc.aafc.dina.service.DinaService;
 import ca.gc.aafc.transaction.api.dto.TransactionDto;

src/main/java/ca/gc/aafc/transaction/api/security/TransactionManagedAttributeAuthorizationService.java

@@ -3,10 +3,12 @@
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.stereotype.Service;
 
-import ca.gc.aafc.dina.security.PermissionAuthorizationService;
+import ca.gc.aafc.dina.security.auth.PermissionAuthorizationService;
 
 @Service
 public class TransactionManagedAttributeAuthorizationService extends PermissionAuthorizationService {
+
+
   @Override
   @PreAuthorize("hasMinimumGroupAndRolePermissions(@currentUser, 'SUPER_USER', #entity)")
   public void authorizeCreate(Object entity) {

src/main/resources/application.yml

@@ -52,11 +52,8 @@ dina.auditing.enabled: true
 
 rabbitmq:
   queue: dina.search.queue
-  exchange: dina.search.exchange
-  routingkey: dina.search.routingkey
   username: guest
   password: guest
   host: ${RABBITMQ_HOSTNAME:localhost}
-  port: 15672
 messaging:
   isProducer: false