#813 - changed user types

avniproject · Oct 30, 2024 · 8b6872f · 8b6872f
1 parent 2154c34
commit 8b6872f
Show file tree

Hide file tree

Showing 132 changed files with 651 additions and 1,234 deletions.
diff --git a/avni-server-api/build.gradle b/avni-server-api/build.gradle
@@ -79,7 +79,7 @@ dependencies {
     implementation 'com.fasterxml.jackson.core:jackson-annotations:2.12.6'
     implementation 'com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.12.6'
     implementation 'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.12.6'
-    implementation 'org.hibernate:hibernate-ehcache:5.2.14.Final'
+    implementation 'org.hibernate:hibernate-ehcache:5.6.15.Final'
     implementation 'javax.cache:cache-api:1.1.1'
     dev "org.springframework.boot:spring-boot-devtools:${springBootVersion}"
     testImplementation "org.mockito:mockito-core:2.23.4"

diff --git a/avni-server-api/src/main/java/org/avni/Avni.java b/avni-server-api/src/main/java/org/avni/Avni.java
diff --git a/avni-server-api/src/main/java/org/avni/messaging/domain/ManualMessage.java b/avni-server-api/src/main/java/org/avni/messaging/domain/ManualMessage.java
@@ -1,6 +1,8 @@
 package org.avni.messaging.domain;
 
 import org.avni.server.domain.OrganisationAwareEntity;
+import org.avni.server.framework.hibernate.ArrayUserType;
+import org.avni.server.framework.hibernate.NextTriggerDetailsUserType;
 import org.hibernate.annotations.Type;
 
 import javax.persistence.Column;
@@ -14,11 +16,11 @@ public class ManualMessage extends OrganisationAwareEntity {
     private String messageTemplateId;
 
     @Column(columnDefinition = "text[]")
-    @Type(type = "parameters")
+    @Type(value = ArrayUserType.class)
     private String[] parameters;
 
     @Column
-    @Type(type = "nextTriggerDetails")
+    @Type(value = NextTriggerDetailsUserType.class)
     private NextTriggerDetails nextTriggerDetails;
 
     public ManualMessage(String messageTemplateId, String[] parameters) {

diff --git a/avni-server-api/src/main/java/org/avni/server/adapter/HealthModuleInvoker.java b/avni-server-api/src/main/java/org/avni/server/adapter/HealthModuleInvoker.java
diff --git a/avni-server-api/src/main/java/org/avni/server/adapter/HealthModuleInvokerFactory.java b/avni-server-api/src/main/java/org/avni/server/adapter/HealthModuleInvokerFactory.java
diff --git a/avni-server-api/src/main/java/org/avni/server/adapter/ProgramEncounterRuleInvoker.java b/avni-server-api/src/main/java/org/avni/server/adapter/ProgramEncounterRuleInvoker.java
diff --git a/avni-server-api/src/main/java/org/avni/server/adapter/ProgramEnrolmentModuleInvoker.java b/avni-server-api/src/main/java/org/avni/server/adapter/ProgramEnrolmentModuleInvoker.java
diff --git a/avni-server-api/src/main/java/org/avni/server/adapter/contract/DecisionRuleResponse.java b/avni-server-api/src/main/java/org/avni/server/adapter/contract/DecisionRuleResponse.java
diff --git a/avni-server-api/src/main/java/org/avni/server/adapter/contract/IndividualRuleInput.java b/avni-server-api/src/main/java/org/avni/server/adapter/contract/IndividualRuleInput.java
diff --git a/...er-api/src/main/java/org/avni/server/adapter/contract/ProgramScheduledVisitsResponse.java b/...er-api/src/main/java/org/avni/server/adapter/contract/ProgramScheduledVisitsResponse.java