added fixed ID

ncats · Nov 24, 2021 · 9f8a9df · 9f8a9df
1 parent 067974c
commit 9f8a9df
Show file tree

Hide file tree

Showing 13 changed files with 64 additions and 54 deletions.
diff --git a/...ava/gov/hhs/gsrs/adverseevents/adverseeventcvm/controllers/AdverseEventCvmController.java b/...ava/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<AdverseEventCvmController, AdverseEventCvm, Long> {
+@GsrsRestApiController(context = AdverseEventCvmEntityService.CONTEXT, idHelper = IdHelpers.STRING_NO_WHITESPACE)
+public class AdverseEventCvmController extends EtagLegacySearchEntityController<AdverseEventCvmController, AdverseEventCvm, String> {
 
     @Autowired
     private ETagRepository eTagRepository;
@@ -89,7 +89,7 @@ public class AdverseEventCvmController extends EtagLegacySearchEntityController<
 
 
     @Override
-    public GsrsEntityService<AdverseEventCvm, Long> getEntityService() {
+    public GsrsEntityService<AdverseEventCvm, String> getEntityService() {
         return adverseEventEntityService;
     }
 

diff --git a/...gure/src/main/java/gov/hhs/gsrs/adverseevents/adverseeventcvm/models/AdverseEventCvm.java b/...gure/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/...java/gov/hhs/gsrs/adverseevents/adverseeventcvm/repository/AdverseEventCvmRepository.java b/...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<AdverseEventCvm, Long> {
+public interface AdverseEventCvmRepository extends GsrsRepository<AdverseEventCvm, String> {
 
-    Optional<AdverseEventCvm> findById(Long id);
+    Optional<AdverseEventCvm> findById(String id);
 }
diff --git a/...ava/gov/hhs/gsrs/adverseevents/adverseeventcvm/services/AdverseEventCvmEntityService.java b/...ava/gov/hhs/gsrs/adverseevents/adverseeventcvm/services/AdverseEventCvmEntityService.java
@@ -32,7 +32,7 @@
 import java.util.Optional;
 
 @Service
-public class AdverseEventCvmEntityService extends AbstractGsrsEntityService<AdverseEventCvm, Long> {
+public class AdverseEventCvmEntityService extends AbstractGsrsEntityService<AdverseEventCvm, String> {
     public static final String  CONTEXT = "adverseeventcvm";
 
     public AdverseEventCvmEntityService() {
@@ -54,8 +54,8 @@ public Class<AdverseEventCvm> 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<AdverseEventCvm> newCreationEvent(AdverseEv
     }
 
     @Override
-    public Long getIdFrom(AdverseEventCvm entity) {
+    public String getIdFrom(AdverseEventCvm entity) {
         return entity.id;
     }
 
@@ -136,8 +136,8 @@ protected List<AdverseEventCvm> 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<AdverseEventCvm> get(Long id) {
+    public Optional<AdverseEventCvm> get(String id) {
         return repository.findById(id);
     }
 
@@ -155,11 +155,11 @@ public Optional<AdverseEventCvm> flexLookup(String someKindOfId) {
         if (someKindOfId == null){
             return Optional.empty();
         }
-        return repository.findById(Long.parseLong(someKindOfId));
+        return repository.findById(someKindOfId);
     }
 
     @Override
-    protected Optional<Long> flexLookupIdOnly(String someKindOfId) {
+    protected Optional<String> flexLookupIdOnly(String someKindOfId) {
         //easiest way to avoid deduping data is to just do a full flex lookup and then return id
         Optional<AdverseEventCvm> found = flexLookup(someKindOfId);
         if(found.isPresent()){

diff --git a/...ava/gov/hhs/gsrs/adverseevents/adverseeventdme/controllers/AdverseEventDmeController.java b/...ava/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<AdverseEventDmeController, AdverseEventDme, Long> {
+@GsrsRestApiController(context = AdverseEventDmeEntityService.CONTEXT, idHelper = IdHelpers.STRING_NO_WHITESPACE)
+public class AdverseEventDmeController extends EtagLegacySearchEntityController<AdverseEventDmeController, AdverseEventDme, String> {
 
 
     @Autowired
@@ -90,7 +90,7 @@ public class AdverseEventDmeController extends EtagLegacySearchEntityController<
 
 
     @Override
-    public GsrsEntityService<AdverseEventDme, Long> getEntityService() {
+    public GsrsEntityService<AdverseEventDme, String> getEntityService() {
         return adverseEventEntityService;
     }
 

diff --git a/...gure/src/main/java/gov/hhs/gsrs/adverseevents/adverseeventdme/models/AdverseEventDme.java b/...gure/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/...ava/gov/hhs/gsrs/adverseevents/adverseeventdme/respository/AdverseEventDmeRepository.java b/...ava/gov/hhs/gsrs/adverseevents/adverseeventdme/respository/AdverseEventDmeRepository.java
@@ -9,7 +9,7 @@
 import java.util.Optional;
 
 @Service
-public interface AdverseEventDmeRepository extends GsrsRepository<AdverseEventDme, Long> {
+public interface AdverseEventDmeRepository extends GsrsRepository<AdverseEventDme, String> {
 
     Optional<AdverseEventDme> findById(String id);
 }
diff --git a/...ava/gov/hhs/gsrs/adverseevents/adverseeventdme/services/AdverseEventDmeEntityService.java b/...ava/gov/hhs/gsrs/adverseevents/adverseeventdme/services/AdverseEventDmeEntityService.java
@@ -38,7 +38,7 @@
 import java.util.Optional;
 
 @Service
-public class AdverseEventDmeEntityService extends AbstractGsrsEntityService<AdverseEventDme, Long> {
+public class AdverseEventDmeEntityService extends AbstractGsrsEntityService<AdverseEventDme, String> {
     public static final String  CONTEXT = "adverseeventdme";
 
     public AdverseEventDmeEntityService() {
@@ -60,8 +60,8 @@ public Class<AdverseEventDme> 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<AdverseEventDme> 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<AdverseEventDme> get(Long id) {
+    public Optional<AdverseEventDme> get(String id) {
         return repository.findById(id);
     }
 
@@ -161,11 +161,11 @@ public Optional<AdverseEventDme> flexLookup(String someKindOfId) {
         if (someKindOfId == null){
             return Optional.empty();
         }
-        return repository.findById(Long.parseLong(someKindOfId));
+        return repository.findById(someKindOfId);
     }
 
     @Override
-    protected Optional<Long> flexLookupIdOnly(String someKindOfId) {
+    protected Optional<String> flexLookupIdOnly(String someKindOfId) {
         //easiest way to avoid deduping data is to just do a full flex lookup and then return id
         Optional<AdverseEventDme> found = flexLookup(someKindOfId);
         if(found.isPresent()){

diff --git a/.../java/gov/hhs/gsrs/adverseevents/adverseeventpt/controllers/AdverseEventPtController.java b/.../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<AdverseEventPtController, AdverseEventPt, Long> {
+@GsrsRestApiController(context = AdverseEventPtEntityService.CONTEXT, idHelper = IdHelpers.STRING_NO_WHITESPACE)
+public class AdverseEventPtController extends EtagLegacySearchEntityController<AdverseEventPtController, AdverseEventPt, String> {
 
     @Autowired
     private ETagRepository eTagRepository;
@@ -89,7 +89,7 @@ public class AdverseEventPtController extends EtagLegacySearchEntityController<A
 
 
     @Override
-    public GsrsEntityService<AdverseEventPt, Long> getEntityService() {
+    public GsrsEntityService<AdverseEventPt, String> getEntityService() {
         return adverseEventEntityService;
     }
 

diff --git a/...main/java/gov/hhs/gsrs/adverseevents/adverseeventpt/exporters/AdverseEventPtExporter.java b/...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/...figure/src/main/java/gov/hhs/gsrs/adverseevents/adverseeventpt/models/AdverseEventPt.java b/...figure/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/...n/java/gov/hhs/gsrs/adverseevents/adverseeventpt/repository/AdverseEventPtRepository.java b/...n/java/gov/hhs/gsrs/adverseevents/adverseeventpt/repository/AdverseEventPtRepository.java
@@ -12,9 +12,9 @@
 import java.util.Optional;
 
 @Service
-public interface AdverseEventPtRepository extends GsrsRepository<AdverseEventPt, Long> {
+public interface AdverseEventPtRepository extends GsrsRepository<AdverseEventPt, String> {
 
-    Optional<AdverseEventPt> findById(Long id);
+    Optional<AdverseEventPt> findById(String id);
 
     @Query("SELECT a FROM AdverseEventFAERSDashboard a where lower(a.nameTruncateGP) = lower(?1)")
     AdverseEventFAERSDashboard findFaersDashboardRecordByName(String name);

diff --git a/.../java/gov/hhs/gsrs/adverseevents/adverseeventpt/services/AdverseEventPtEntityService.java b/.../java/gov/hhs/gsrs/adverseevents/adverseeventpt/services/AdverseEventPtEntityService.java
@@ -32,7 +32,7 @@
 import java.util.Optional;
 
 @Service
-public class AdverseEventPtEntityService extends AbstractGsrsEntityService<AdverseEventPt, Long> {
+public class AdverseEventPtEntityService extends AbstractGsrsEntityService<AdverseEventPt, String> {
     public static final String  CONTEXT = "adverseeventpt";
 
     public AdverseEventPtEntityService() {
@@ -54,8 +54,8 @@ public Class<AdverseEventPt> 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<AdverseEventPt> 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<AdverseEventPt> get(Long id) {
+    public Optional<AdverseEventPt> get(String id) {
         return repository.findById(id);
     }
 
@@ -155,11 +155,11 @@ public Optional<AdverseEventPt> flexLookup(String someKindOfId) {
         if (someKindOfId == null){
             return Optional.empty();
         }
-        return repository.findById(Long.parseLong(someKindOfId));
+        return repository.findById(someKindOfId);
     }
 
     @Override
-    protected Optional<Long> flexLookupIdOnly(String someKindOfId) {
+    protected Optional<String> flexLookupIdOnly(String someKindOfId) {
         //easiest way to avoid deduping data is to just do a full flex lookup and then return id
         Optional<AdverseEventPt> found = flexLookup(someKindOfId);
         if(found.isPresent()){