From 9f8a9df1233b7daaa2771bd38ef2b0ca67df9486 Mon Sep 17 00:00:00 2001 From: Newatia Date: Wed, 24 Nov 2021 10:12:51 -0500 Subject: [PATCH] added fixed ID --- .../AdverseEventCvmController.java | 6 ++--- .../models/AdverseEventCvm.java | 9 ++++--- .../repository/AdverseEventCvmRepository.java | 7 +++--- .../AdverseEventCvmEntityService.java | 24 +++++++++---------- .../AdverseEventDmeController.java | 6 ++--- .../models/AdverseEventDme.java | 9 ++++--- .../AdverseEventDmeRepository.java | 2 +- .../AdverseEventDmeEntityService.java | 16 ++++++------- .../controllers/AdverseEventPtController.java | 6 ++--- .../exporters/AdverseEventPtExporter.java | 2 +- .../adverseeventpt/models/AdverseEventPt.java | 11 +++++---- .../repository/AdverseEventPtRepository.java | 4 ++-- .../services/AdverseEventPtEntityService.java | 16 ++++++------- 13 files changed, 64 insertions(+), 54 deletions(-) diff --git a/gsrs-module-adverse-events-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/adverseevents/adverseeventcvm/controllers/AdverseEventCvmController.java b/gsrs-module-adverse-events-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/adverseevents/adverseeventcvm/controllers/AdverseEventCvmController.java index bb366b9..8f2b64d 100644 --- a/gsrs-module-adverse-events-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/adverseevents/adverseeventcvm/controllers/AdverseEventCvmController.java +++ b/gsrs-module-adverse-events-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/adverseevents/adverseeventcvm/controllers/AdverseEventCvmController.java @@ -53,8 +53,8 @@ import javax.persistence.EntityManager; @ExposesResourceFor(AdverseEventCvm.class) -@GsrsRestApiController(context = AdverseEventCvmEntityService.CONTEXT, idHelper = IdHelpers.NUMBER) -public class AdverseEventCvmController extends EtagLegacySearchEntityController { +@GsrsRestApiController(context = AdverseEventCvmEntityService.CONTEXT, idHelper = IdHelpers.STRING_NO_WHITESPACE) +public class AdverseEventCvmController extends EtagLegacySearchEntityController { @Autowired private ETagRepository eTagRepository; @@ -89,7 +89,7 @@ public class AdverseEventCvmController extends EtagLegacySearchEntityController< @Override - public GsrsEntityService getEntityService() { + public GsrsEntityService getEntityService() { return adverseEventEntityService; } diff --git a/gsrs-module-adverse-events-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/adverseevents/adverseeventcvm/models/AdverseEventCvm.java b/gsrs-module-adverse-events-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/adverseevents/adverseeventcvm/models/AdverseEventCvm.java index 7d0919e..7aae7a8 100644 --- a/gsrs-module-adverse-events-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/adverseevents/adverseeventcvm/models/AdverseEventCvm.java +++ b/gsrs-module-adverse-events-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/adverseevents/adverseeventcvm/models/AdverseEventCvm.java @@ -39,8 +39,11 @@ public class AdverseEventCvm extends AbstractGsrsEntity implements SubstanceAdverseEvent { @Id - @Column(name="ID") - public Long id; + @Column(name = "AE_ID") + public String id; + + @Column(name = "ID") + public Long id2; @Column(name="SUBSTANCE_ID") public String substanceId; @@ -77,7 +80,7 @@ public String getDeprecated(){ return "Not Deprecated"; } - public Long getId() { + public String getId() { return id; } diff --git a/gsrs-module-adverse-events-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/adverseevents/adverseeventcvm/repository/AdverseEventCvmRepository.java b/gsrs-module-adverse-events-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/adverseevents/adverseeventcvm/repository/AdverseEventCvmRepository.java index 63165ae..dee969e 100644 --- a/gsrs-module-adverse-events-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/adverseevents/adverseeventcvm/repository/AdverseEventCvmRepository.java +++ b/gsrs-module-adverse-events-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/adverseevents/adverseeventcvm/repository/AdverseEventCvmRepository.java @@ -1,6 +1,7 @@ package gov.hhs.gsrs.adverseevents.adverseeventcvm.repository; -import gov.hhs.gsrs.adverseevents.adverseeventcvm.models.*; +import gov.hhs.gsrs.adverseevents.adverseeventcvm.models.AdverseEventCvm; +import gov.hhs.gsrs.adverseevents.adverseeventcvm.models.AdverseEventCvm; import gsrs.repository.GsrsRepository; import org.springframework.data.jpa.repository.JpaRepository; @@ -9,7 +10,7 @@ import java.util.Optional; @Service -public interface AdverseEventCvmRepository extends GsrsRepository { +public interface AdverseEventCvmRepository extends GsrsRepository { - Optional findById(Long id); + Optional findById(String id); } diff --git a/gsrs-module-adverse-events-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/adverseevents/adverseeventcvm/services/AdverseEventCvmEntityService.java b/gsrs-module-adverse-events-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/adverseevents/adverseeventcvm/services/AdverseEventCvmEntityService.java index 2ce6fa2..70f52b4 100644 --- a/gsrs-module-adverse-events-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/adverseevents/adverseeventcvm/services/AdverseEventCvmEntityService.java +++ b/gsrs-module-adverse-events-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/adverseevents/adverseeventcvm/services/AdverseEventCvmEntityService.java @@ -32,7 +32,7 @@ import java.util.Optional; @Service -public class AdverseEventCvmEntityService extends AbstractGsrsEntityService { +public class AdverseEventCvmEntityService extends AbstractGsrsEntityService { public static final String CONTEXT = "adverseeventcvm"; public AdverseEventCvmEntityService() { @@ -54,8 +54,8 @@ public Class getEntityClass() { } @Override - public Long parseIdFromString(String idAsString) { - return Long.parseLong(idAsString); + public String parseIdFromString(String idAsString) { + return idAsString; } @Override @@ -80,12 +80,12 @@ protected AdverseEventCvm create(AdverseEventCvm adverse) { @Override @Transactional - protected AdverseEventCvm update(AdverseEventCvm product) { - return repository.saveAndFlush(product); + protected AdverseEventCvm update(AdverseEventCvm adverse) { + return repository.saveAndFlush(adverse); } @Override - public void delete(Long id) { + public void delete(String id) { repository.deleteById(id); } @@ -100,7 +100,7 @@ protected AbstractEntityCreatedEvent newCreationEvent(AdverseEv } @Override - public Long getIdFrom(AdverseEventCvm entity) { + public String getIdFrom(AdverseEventCvm entity) { return entity.id; } @@ -136,8 +136,8 @@ protected List fromUpdatedJsonList(JsonNode list) throws IOExce } @Override - protected JsonNode toJson(AdverseEventCvm product) throws IOException { - return objectMapper.valueToTree(product); + protected JsonNode toJson(AdverseEventCvm adverse) throws IOException { + return objectMapper.valueToTree(adverse); } @Override @@ -146,7 +146,7 @@ public long count() { } @Override - public Optional get(Long id) { + public Optional get(String id) { return repository.findById(id); } @@ -155,11 +155,11 @@ public Optional flexLookup(String someKindOfId) { if (someKindOfId == null){ return Optional.empty(); } - return repository.findById(Long.parseLong(someKindOfId)); + return repository.findById(someKindOfId); } @Override - protected Optional flexLookupIdOnly(String someKindOfId) { + protected Optional flexLookupIdOnly(String someKindOfId) { //easiest way to avoid deduping data is to just do a full flex lookup and then return id Optional found = flexLookup(someKindOfId); if(found.isPresent()){ diff --git a/gsrs-module-adverse-events-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/adverseevents/adverseeventdme/controllers/AdverseEventDmeController.java b/gsrs-module-adverse-events-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/adverseevents/adverseeventdme/controllers/AdverseEventDmeController.java index 245080f..4edafba 100644 --- a/gsrs-module-adverse-events-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/adverseevents/adverseeventdme/controllers/AdverseEventDmeController.java +++ b/gsrs-module-adverse-events-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/adverseevents/adverseeventdme/controllers/AdverseEventDmeController.java @@ -53,8 +53,8 @@ import javax.persistence.EntityManager; @ExposesResourceFor(AdverseEventDme.class) -@GsrsRestApiController(context = AdverseEventDmeEntityService.CONTEXT, idHelper = IdHelpers.NUMBER) -public class AdverseEventDmeController extends EtagLegacySearchEntityController { +@GsrsRestApiController(context = AdverseEventDmeEntityService.CONTEXT, idHelper = IdHelpers.STRING_NO_WHITESPACE) +public class AdverseEventDmeController extends EtagLegacySearchEntityController { @Autowired @@ -90,7 +90,7 @@ public class AdverseEventDmeController extends EtagLegacySearchEntityController< @Override - public GsrsEntityService getEntityService() { + public GsrsEntityService getEntityService() { return adverseEventEntityService; } diff --git a/gsrs-module-adverse-events-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/adverseevents/adverseeventdme/models/AdverseEventDme.java b/gsrs-module-adverse-events-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/adverseevents/adverseeventdme/models/AdverseEventDme.java index ddf2978..1ee4681 100644 --- a/gsrs-module-adverse-events-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/adverseevents/adverseeventdme/models/AdverseEventDme.java +++ b/gsrs-module-adverse-events-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/adverseevents/adverseeventdme/models/AdverseEventDme.java @@ -40,8 +40,11 @@ public class AdverseEventDme extends AbstractGsrsEntity implements SubstanceAdverseEvent { @Id - @Column(name="ID") - public Long id; + @Column(name = "AE_ID") + public String id; + + @Column(name = "ID") + public Long id2; @Column(name="SUBSTANCE_ID") public String substanceId; @@ -83,7 +86,7 @@ public String getDeprecated(){ return "Not Deprecated"; } - public Long getId() { + public String getId() { return id; } diff --git a/gsrs-module-adverse-events-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/adverseevents/adverseeventdme/respository/AdverseEventDmeRepository.java b/gsrs-module-adverse-events-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/adverseevents/adverseeventdme/respository/AdverseEventDmeRepository.java index 4d6c22d..1dcf963 100644 --- a/gsrs-module-adverse-events-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/adverseevents/adverseeventdme/respository/AdverseEventDmeRepository.java +++ b/gsrs-module-adverse-events-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/adverseevents/adverseeventdme/respository/AdverseEventDmeRepository.java @@ -9,7 +9,7 @@ import java.util.Optional; @Service -public interface AdverseEventDmeRepository extends GsrsRepository { +public interface AdverseEventDmeRepository extends GsrsRepository { Optional findById(String id); } diff --git a/gsrs-module-adverse-events-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/adverseevents/adverseeventdme/services/AdverseEventDmeEntityService.java b/gsrs-module-adverse-events-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/adverseevents/adverseeventdme/services/AdverseEventDmeEntityService.java index b4c98de..0bd3236 100644 --- a/gsrs-module-adverse-events-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/adverseevents/adverseeventdme/services/AdverseEventDmeEntityService.java +++ b/gsrs-module-adverse-events-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/adverseevents/adverseeventdme/services/AdverseEventDmeEntityService.java @@ -38,7 +38,7 @@ import java.util.Optional; @Service -public class AdverseEventDmeEntityService extends AbstractGsrsEntityService { +public class AdverseEventDmeEntityService extends AbstractGsrsEntityService { public static final String CONTEXT = "adverseeventdme"; public AdverseEventDmeEntityService() { @@ -60,8 +60,8 @@ public Class getEntityClass() { } @Override - public Long parseIdFromString(String idAsString) { - return Long.parseLong(idAsString); + public String parseIdFromString(String idAsString) { + return idAsString; } @Override @@ -91,7 +91,7 @@ protected AdverseEventDme update(AdverseEventDme adverse) { } @Override - public void delete(Long id) { + public void delete(String id) { repository.deleteById(id); } @@ -106,7 +106,7 @@ protected AbstractEntityCreatedEvent newCreationEvent(AdverseEv } @Override - public Long getIdFrom(AdverseEventDme entity) { + public String getIdFrom(AdverseEventDme entity) { return entity.id; } @@ -152,7 +152,7 @@ public long count() { } @Override - public Optional get(Long id) { + public Optional get(String id) { return repository.findById(id); } @@ -161,11 +161,11 @@ public Optional flexLookup(String someKindOfId) { if (someKindOfId == null){ return Optional.empty(); } - return repository.findById(Long.parseLong(someKindOfId)); + return repository.findById(someKindOfId); } @Override - protected Optional flexLookupIdOnly(String someKindOfId) { + protected Optional flexLookupIdOnly(String someKindOfId) { //easiest way to avoid deduping data is to just do a full flex lookup and then return id Optional found = flexLookup(someKindOfId); if(found.isPresent()){ diff --git a/gsrs-module-adverse-events-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/adverseevents/adverseeventpt/controllers/AdverseEventPtController.java b/gsrs-module-adverse-events-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/adverseevents/adverseeventpt/controllers/AdverseEventPtController.java index 274c2c4..ac02575 100644 --- a/gsrs-module-adverse-events-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/adverseevents/adverseeventpt/controllers/AdverseEventPtController.java +++ b/gsrs-module-adverse-events-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/adverseevents/adverseeventpt/controllers/AdverseEventPtController.java @@ -53,8 +53,8 @@ import javax.persistence.EntityManager; @ExposesResourceFor(AdverseEventPt.class) -@GsrsRestApiController(context = AdverseEventPtEntityService.CONTEXT, idHelper = IdHelpers.NUMBER) -public class AdverseEventPtController extends EtagLegacySearchEntityController { +@GsrsRestApiController(context = AdverseEventPtEntityService.CONTEXT, idHelper = IdHelpers.STRING_NO_WHITESPACE) +public class AdverseEventPtController extends EtagLegacySearchEntityController { @Autowired private ETagRepository eTagRepository; @@ -89,7 +89,7 @@ public class AdverseEventPtController extends EtagLegacySearchEntityController getEntityService() { + public GsrsEntityService getEntityService() { return adverseEventEntityService; } diff --git a/gsrs-module-adverse-events-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/adverseevents/adverseeventpt/exporters/AdverseEventPtExporter.java b/gsrs-module-adverse-events-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/adverseevents/adverseeventpt/exporters/AdverseEventPtExporter.java index 2f8a457..691c343 100644 --- a/gsrs-module-adverse-events-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/adverseevents/adverseeventpt/exporters/AdverseEventPtExporter.java +++ b/gsrs-module-adverse-events-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/adverseevents/adverseeventpt/exporters/AdverseEventPtExporter.java @@ -79,7 +79,7 @@ public void close() throws IOException { DEFAULT_RECIPE_MAP.put(PtDefaultColumns.SUBSTANCE_NAME, SingleColumnValueRecipe.create(PtDefaultColumns.SUBSTANCE_NAME, (s, cell) -> cell.writeString(s.name))); DEFAULT_RECIPE_MAP.put(PtDefaultColumns.APPROVAL_ID, SingleColumnValueRecipe.create(PtDefaultColumns.APPROVAL_ID, (s, cell) -> cell.writeString(s.unii))); DEFAULT_RECIPE_MAP.put(PtDefaultColumns.SUBSTANCE_KEY, SingleColumnValueRecipe.create(PtDefaultColumns.SUBSTANCE_KEY, (s, cell) -> cell.writeString(s.substanceKey))); - DEFAULT_RECIPE_MAP.put(PtDefaultColumns.PT_TERM, SingleColumnValueRecipe.create(PtDefaultColumns.PT_TERM, (s, cell) -> cell.writeString(s.adverseEvent))); + DEFAULT_RECIPE_MAP.put(PtDefaultColumns.PT_TERM, SingleColumnValueRecipe.create(PtDefaultColumns.PT_TERM, (s, cell) -> cell.writeString(s.ptTerm))); DEFAULT_RECIPE_MAP.put(PtDefaultColumns.PRIM_SOC, SingleColumnValueRecipe.create(PtDefaultColumns.PRIM_SOC, (s, cell) -> cell.writeString(s.primSoc))); DEFAULT_RECIPE_MAP.put(PtDefaultColumns.CASE_COUNT, SingleColumnValueRecipe.create(PtDefaultColumns.CASE_COUNT, (s, cell) -> { String count = (s.caseCount != null) ? Integer.toString(s.caseCount) : null; diff --git a/gsrs-module-adverse-events-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/adverseevents/adverseeventpt/models/AdverseEventPt.java b/gsrs-module-adverse-events-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/adverseevents/adverseeventpt/models/AdverseEventPt.java index 2569363..7ea48a7 100644 --- a/gsrs-module-adverse-events-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/adverseevents/adverseeventpt/models/AdverseEventPt.java +++ b/gsrs-module-adverse-events-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/adverseevents/adverseeventpt/models/AdverseEventPt.java @@ -45,8 +45,11 @@ public class AdverseEventPt extends AbstractGsrsEntity implements SubstanceAdverseEvent { @Id + @Column(name = "AE_ID") + public String id; + @Column(name = "ID") - public Long id; + public Long id2; @Column(name="SUBSTANCE_ID") public String substanceId; @@ -62,9 +65,9 @@ public class AdverseEventPt extends AbstractGsrsEntity implements SubstanceAdver @Column(name = "NAME") public String name; - @Indexable(suggest = true, facet = true, name = "Adverse Event") + @Indexable(suggest = true, facet = true, name = "PT Term") @Column(name = "PT_TERM") - public String adverseEvent; + public String ptTerm; @Indexable(suggest = true, facet = true, name = "Prim SOC") @Column(name = "PRIM_SOC") @@ -91,7 +94,7 @@ public class AdverseEventPt extends AbstractGsrsEntity implements SubstanceAdver @Column(name = "PRR") public Double prr; - public Long getId() { + public String getId() { return id; } diff --git a/gsrs-module-adverse-events-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/adverseevents/adverseeventpt/repository/AdverseEventPtRepository.java b/gsrs-module-adverse-events-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/adverseevents/adverseeventpt/repository/AdverseEventPtRepository.java index 2f5980f..4159097 100644 --- a/gsrs-module-adverse-events-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/adverseevents/adverseeventpt/repository/AdverseEventPtRepository.java +++ b/gsrs-module-adverse-events-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/adverseevents/adverseeventpt/repository/AdverseEventPtRepository.java @@ -12,9 +12,9 @@ import java.util.Optional; @Service -public interface AdverseEventPtRepository extends GsrsRepository { +public interface AdverseEventPtRepository extends GsrsRepository { - Optional findById(Long id); + Optional findById(String id); @Query("SELECT a FROM AdverseEventFAERSDashboard a where lower(a.nameTruncateGP) = lower(?1)") AdverseEventFAERSDashboard findFaersDashboardRecordByName(String name); diff --git a/gsrs-module-adverse-events-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/adverseevents/adverseeventpt/services/AdverseEventPtEntityService.java b/gsrs-module-adverse-events-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/adverseevents/adverseeventpt/services/AdverseEventPtEntityService.java index b76b25b..f329d86 100644 --- a/gsrs-module-adverse-events-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/adverseevents/adverseeventpt/services/AdverseEventPtEntityService.java +++ b/gsrs-module-adverse-events-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/adverseevents/adverseeventpt/services/AdverseEventPtEntityService.java @@ -32,7 +32,7 @@ import java.util.Optional; @Service -public class AdverseEventPtEntityService extends AbstractGsrsEntityService { +public class AdverseEventPtEntityService extends AbstractGsrsEntityService { public static final String CONTEXT = "adverseeventpt"; public AdverseEventPtEntityService() { @@ -54,8 +54,8 @@ public Class getEntityClass() { } @Override - public Long parseIdFromString(String idAsString) { - return Long.parseLong(idAsString); + public String parseIdFromString(String idAsString) { + return idAsString; } @Override @@ -85,7 +85,7 @@ protected AdverseEventPt update(AdverseEventPt adverse) { } @Override - public void delete(Long id) { + public void delete(String id) { repository.deleteById(id); } @@ -100,7 +100,7 @@ protected AbstractEntityCreatedEvent newCreationEvent(AdverseEve } @Override - public Long getIdFrom(AdverseEventPt entity) { + public String getIdFrom(AdverseEventPt entity) { return entity.id; } @@ -146,7 +146,7 @@ public long count() { } @Override - public Optional get(Long id) { + public Optional get(String id) { return repository.findById(id); } @@ -155,11 +155,11 @@ public Optional flexLookup(String someKindOfId) { if (someKindOfId == null){ return Optional.empty(); } - return repository.findById(Long.parseLong(someKindOfId)); + return repository.findById(someKindOfId); } @Override - protected Optional flexLookupIdOnly(String someKindOfId) { + protected Optional flexLookupIdOnly(String someKindOfId) { //easiest way to avoid deduping data is to just do a full flex lookup and then return id Optional found = flexLookup(someKindOfId); if(found.isPresent()){