From 467126b2899a6dcdb263e6475e7eab85ec14f28d Mon Sep 17 00:00:00 2001 From: Newatia Date: Fri, 24 Sep 2021 14:40:00 -0400 Subject: [PATCH] fixed reindexing twice --- .../application/exporters/ApplicationExporter.java | 4 +++- .../hhs/gsrs/application/application/models/Application.java | 1 - .../application/applicationall/models/AppIndicationAll.java | 1 - .../application/applicationall/models/ApplicationAll.java | 4 ++++ .../applicationdarrts/models/ApplicationDarrts.java | 4 ++++ .../application/searchcount/models/SubstanceSearchCount.java | 4 ++++ 6 files changed, 15 insertions(+), 3 deletions(-) diff --git a/gsrs-module-applications-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/application/application/exporters/ApplicationExporter.java b/gsrs-module-applications-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/application/application/exporters/ApplicationExporter.java index fdac514..f4a1a49 100644 --- a/gsrs-module-applications-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/application/application/exporters/ApplicationExporter.java +++ b/gsrs-module-applications-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/application/application/exporters/ApplicationExporter.java @@ -1,10 +1,12 @@ package gov.hhs.gsrs.application.application.exporters; -import com.fasterxml.jackson.databind.JsonNode; import gov.hhs.gsrs.application.application.controllers.ApplicationController; import gov.hhs.gsrs.application.application.models.*; + import ix.ginas.exporters.*; +import com.fasterxml.jackson.databind.JsonNode; + import java.io.IOException; import java.util.*; diff --git a/gsrs-module-applications-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/application/application/models/Application.java b/gsrs-module-applications-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/application/application/models/Application.java index 6aa60d7..0d34acb 100644 --- a/gsrs-module-applications-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/application/application/models/Application.java +++ b/gsrs-module-applications-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/application/application/models/Application.java @@ -24,7 +24,6 @@ import java.util.Date; import java.util.List; -@EntityListeners({AuditingEntityListener.class, GsrsEntityProcessorListener.class, IndexerEntityListener.class, BackupEntityProcessorListener.class}) @IndexableRoot @Backup @Data diff --git a/gsrs-module-applications-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/application/applicationall/models/AppIndicationAll.java b/gsrs-module-applications-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/application/applicationall/models/AppIndicationAll.java index dc19bee..7d6f0ae 100644 --- a/gsrs-module-applications-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/application/applicationall/models/AppIndicationAll.java +++ b/gsrs-module-applications-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/application/applicationall/models/AppIndicationAll.java @@ -7,7 +7,6 @@ import javax.persistence.*; -@IndexableRoot @Data @Entity @Table(name="SRSCID_APP_INDICATION_ALL_MV") diff --git a/gsrs-module-applications-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/application/applicationall/models/ApplicationAll.java b/gsrs-module-applications-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/application/applicationall/models/ApplicationAll.java index 0acbd44..ae5f362 100644 --- a/gsrs-module-applications-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/application/applicationall/models/ApplicationAll.java +++ b/gsrs-module-applications-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/application/applicationall/models/ApplicationAll.java @@ -2,13 +2,17 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import gsrs.model.AbstractGsrsEntity; +import ix.core.models.Backup; import ix.core.models.Indexable; +import ix.core.models.IndexableRoot; import lombok.Data; import javax.persistence.*; import java.util.ArrayList; import java.util.List; +@IndexableRoot +@Backup @Data @Entity @Table(name="SRSCID_APPLICATION_ALL_MV") diff --git a/gsrs-module-applications-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/application/applicationdarrts/models/ApplicationDarrts.java b/gsrs-module-applications-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/application/applicationdarrts/models/ApplicationDarrts.java index e754fb2..bad4220 100644 --- a/gsrs-module-applications-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/application/applicationdarrts/models/ApplicationDarrts.java +++ b/gsrs-module-applications-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/application/applicationdarrts/models/ApplicationDarrts.java @@ -1,12 +1,16 @@ package gov.hhs.gsrs.application.applicationdarrts.models; import gsrs.model.AbstractGsrsEntity; +import ix.core.models.Backup; +import ix.core.models.IndexableRoot; import lombok.Data; import javax.persistence.*; import java.util.ArrayList; import java.util.List; +@IndexableRoot +@Backup @Data @Entity @IdClass(ApplicationDarrtsCompositePrimaryKeyId.class) diff --git a/gsrs-module-applications-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/application/searchcount/models/SubstanceSearchCount.java b/gsrs-module-applications-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/application/searchcount/models/SubstanceSearchCount.java index e6d85ee..9125a68 100644 --- a/gsrs-module-applications-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/application/searchcount/models/SubstanceSearchCount.java +++ b/gsrs-module-applications-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/application/searchcount/models/SubstanceSearchCount.java @@ -2,10 +2,14 @@ import gsrs.model.AbstractGsrsEntity; +import ix.core.models.Backup; +import ix.core.models.IndexableRoot; import lombok.Data; import javax.persistence.*; +@IndexableRoot +@Backup @Data @Entity @IdClass(SearchCountCompositePrimaryKeyId.class)