Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP: GSRS 3.1.2 - ready for HOCON config #25

Open
wants to merge 5 commits into
base: starter
Choose a base branch
from
Open

WIP: GSRS 3.1.2 - ready for HOCON config #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4706f96
making a version of applications compatible with the new HOCON config
ChemMitch Oct 24, 2024
09d176c
adding .getignore
ChemMitch Oct 25, 2024
a1a595e
modify ctrial_us table, be like ct
alx652 Dec 5, 2024
2f381c8
modify ct table
alx652 Dec 6, 2024
60c9827
Merge pull request #27 from ncats/mm_3.1.2_ctrial_us_table
alx652 Dec 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
*/target/*
.idea
2 changes: 1 addition & 1 deletion applications-api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>gsrs-module-applications</artifactId>
<groupId>gov.nih.ncats</groupId>
<version>3.1.1-SNAPSHOT</version>
<version>3.1.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion gsrs-module-applications-spring-boot-autoconfigure/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>gsrs-module-applications</artifactId>
<groupId>gov.nih.ncats</groupId>
<version>3.1.1-SNAPSHOT</version>
<version>3.1.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
69 changes: 49 additions & 20 deletions ...e/src/main/java/gov/hhs/gsrs/application/application/models/additional/ClinicalTrial.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,86 +15,115 @@
public class ClinicalTrial extends AbstractGsrsEntity {

@Id
// @Column(name = "NCTN", length=22)
@Column(name = "TRIAL_NUMBER", length=22)
@Column(name = "TRIAL_NUMBER", length=255)
@JsonProperty("nctNumber")
public String nctn;

@Column(name = "TITLE", length=500)
@Lob
@Indexable(sortable = true)
@Column(name = "TITLE")
public String title;

@Column(name = "RECRUITMENT", length=200)
@Column(name = "URL", length=2000)
public String url;

@Lob
@Column(name = "RECRUITMENT", length=4000)
public String recruitment;

@Column(name = "RESULTS_FIRST_RECEIVED", length=100)
@Lob
@Column(name = "RESULTS_FIRST_RECEIVED", length=4000)
public String resultsFirstRecieved;

@Lob
@Indexable(sortable = true)
@Column(name = "CONDITIONS", length=4000)
public String conditions;

@Column(name = "INTERVENTION", length=1800)
@Lob
@Column(name = "INTERVENTION", length=4000)
public String intervention;

@Lob
@Indexable(sortable = true)
@Column(name = "SPONSOR", length=4000)
public String sponsor;

@Column(name = "PHASES", length=50)
@Lob
@Column(name = "PHASES", length=2000)
public String phases;

@Column(name = "FUNDED_BYS", length=100)
@Lob
@Column(name = "FUNDED_BYS", length=2000)
public String fundedBys;

@Lob
@Indexable(facet = true, name = "Study Types")
@Column(name = "STUDY_TYPES", length=150)
@Column(name = "STUDY_TYPES", length=2000)
public String studyTypes;

@Column(name = "STUDY_DESIGNS", length=255)
@Lob
@Column(name = "STUDY_DESIGNS", length=2000)
public String studyDesigns;

@Lob
@Column(name = "STUDY_RESULTS", length=4000)
@Indexable(facet = true, name = "Study Results")
@Column(name = "STUDY_RESULTS", length=100)
public String studyResults;

@Column(name = "AGE_GROUPS", length=100)
@Column(name = "AGE_GROUPS", length=50)
public String ageGroups;


@Column(name = "GENDER", length=50)
@Indexable(facet= true, name = "Gender")
public String gender;

@Column(name = "ENROLLMENT", length=100)
@Lob
@Column(name = "ENROLLMENT", length=2000)
public String enrollment;

@Column(name = "OTHER_IDS", length=550)
@Lob
@Column(name = "OTHER_IDS", length=500)
public String otherIds;

@Column(name = "ACRONYM", length=100)
@Lob
@Column(name = "ACRONYM", length=4000)
public String acronym;

@Column(name = "START_DATE")
@Indexable(name = "Start Date at Source", sortable=true)

public Date startDate;

@Column(name = "LAST_VERIFIED")
@Indexable(name = "Last Verified Date at Source", sortable=true)
public Date lastVerified;

@Column(name = "COMPLETION_DATE")
@Indexable(name = "Completion Date at Source", sortable=true)
public Date completionDate;

@Column(name = "PRIMARY_COMPLETION_DATE")
@Indexable(name = "Primary Completion Date at Source", sortable=true)
public Date primaryCompletionDate;

@Column(name = "FIRST_RECEIVED")
@Indexable(name = "First Received Date at Source", sortable=true)
public Date firstReceived;

@Column(name = "LAST_UPDATED")
@Indexable(name = "Last Updated at Source", sortable=true)
public Date lastUpdated;

@Lob
@Column(name = "OUTCOME_MEASURES", length=4000)
public String outcomeMeasures;

@Column(name = "URL", length=100)
public String url;

/*@Column(name = "LOCATIONS", length=4000)
public String locations;*/
/*
@Lob
@Column(name = "LOCATIONS", length=4000)
public String locations;
*/

}
Loading