Skip to content

Commit

Permalink
Load up to 50 Trials and Display Trials in List View (#19)
Browse files Browse the repository at this point in the history
# Load up to 50 Trials and Display Trials in List View 

## ⚙️ Release Notes 
- Further improves loading NCI trials, improves OpenAPI specification
- Displays the Trials in a List view

![RocketSim_Screenshot_iPhone_15_Pro_6 1_2024-05-06_00 34
11](https://github.com/StanfordBDHG/OwnYourData/assets/28656495/ff0d006d-ff45-4d80-bfc8-6ea13c9e2384)
![RocketSim_Screenshot_iPhone_15_Pro_6 1_2024-05-06_00 34
36](https://github.com/StanfordBDHG/OwnYourData/assets/28656495/1f9374cf-858e-4f09-b0ea-d6cb6c66ea76)
![RocketSim_Screenshot_iPhone_15_Pro_6 1_2024-05-06_00 34
27](https://github.com/StanfordBDHG/OwnYourData/assets/28656495/f7a7c7e2-b565-4529-833f-87eb30328eda)


### Code of Conduct & Contributing Guidelines 

By submitting creating this pull request, you agree to follow our [Code
of
Conduct](https://github.com/StanfordBDHG/.github/blob/main/CODE_OF_CONDUCT.md)
and [Contributing
Guidelines](https://github.com/StanfordBDHG/.github/blob/main/CONTRIBUTING.md):
- [x] I agree to follow the [Code of
Conduct](https://github.com/StanfordBDHG/.github/blob/main/CODE_OF_CONDUCT.md)
and [Contributing
Guidelines](https://github.com/StanfordBDHG/.github/blob/main/CONTRIBUTING.md).
  • Loading branch information
PSchmiedmayer authored May 6, 2024
1 parent e9f011e commit 081d931
Show file tree
Hide file tree
Showing 17 changed files with 3,757 additions and 3,318 deletions.
6,746 changes: 3,479 additions & 3,267 deletions NCIClinicalTrialsSearchAPI.json

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions NCIClinicalTrialsSearchAPI/.openapi-generator/FILES
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ OpenAPIClient/Classes/OpenAPIs/JSONDataEncoding.swift
OpenAPIClient/Classes/OpenAPIs/JSONEncodingHelper.swift
OpenAPIClient/Classes/OpenAPIs/Models.swift
OpenAPIClient/Classes/OpenAPIs/Models/Arm.swift
OpenAPIClient/Classes/OpenAPIs/Models/AssociatedStudy.swift
OpenAPIClient/Classes/OpenAPIs/Models/Biomarker.swift
OpenAPIClient/Classes/OpenAPIs/Models/CentralContact.swift
OpenAPIClient/Classes/OpenAPIs/Models/Collaborators.swift
OpenAPIClient/Classes/OpenAPIs/Models/Coordinates.swift
Expand All @@ -25,6 +27,7 @@ OpenAPIClient/Classes/OpenAPIs/Models/Identifier.swift
OpenAPIClient/Classes/OpenAPIs/Models/Intervention.swift
OpenAPIClient/Classes/OpenAPIs/Models/Masking.swift
OpenAPIClient/Classes/OpenAPIs/Models/OutcomeMeasure.swift
OpenAPIClient/Classes/OpenAPIs/Models/PriorTherapy.swift
OpenAPIClient/Classes/OpenAPIs/Models/Site.swift
OpenAPIClient/Classes/OpenAPIs/Models/StatusHistory.swift
OpenAPIClient/Classes/OpenAPIs/Models/StructuredEligibility.swift
Expand All @@ -38,6 +41,8 @@ OpenAPIClient/Classes/OpenAPIs/Validation.swift
Package.swift
README.md
docs/Arm.md
docs/AssociatedStudy.md
docs/Biomarker.md
docs/BiomarkersAPI.md
docs/CentralContact.md
docs/Collaborators.md
Expand All @@ -51,6 +56,7 @@ docs/InterventionsAPI.md
docs/Masking.md
docs/OrganizationsAPI.md
docs/OutcomeMeasure.md
docs/PriorTherapy.md
docs/Site.md
docs/StatusHistory.md
docs/StructuredEligibility.md
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
//
// AssociatedStudy.swift
//
// Generated by openapi-generator
// https://openapi-generator.tech
//

import Foundation
#if canImport(AnyCodable)
import AnyCodable
#endif

public struct AssociatedStudy: Codable, JSONEncodable, Hashable {

public var studyIdType: String?
public var studyId: String?

public init(studyIdType: String? = nil, studyId: String? = nil) {
self.studyIdType = studyIdType
self.studyId = studyId
}

public enum CodingKeys: String, CodingKey, CaseIterable {
case studyIdType = "study_id_type"
case studyId = "study_id"
}

// Encodable protocol methods

public func encode(to encoder: Encoder) throws {
var container = encoder.container(keyedBy: CodingKeys.self)
try container.encodeIfPresent(studyIdType, forKey: .studyIdType)
try container.encodeIfPresent(studyId, forKey: .studyId)
}
}

Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
//
// Biomarker.swift
//
// Generated by openapi-generator
// https://openapi-generator.tech
//

import Foundation
#if canImport(AnyCodable)
import AnyCodable
#endif

public struct Biomarker: Codable, JSONEncodable, Hashable {

public var eligibilityCriterion: String?
public var inclusionIndicator: String?
public var synonyms: [String]?
public var nciThesaurusConceptId: String?
public var name: String?
public var semanticTypes: [String]?
public var type: [String]?
public var ancestors: [String]?
public var parents: [String]?
public var assayPurpose: String?

public init(eligibilityCriterion: String? = nil, inclusionIndicator: String? = nil, synonyms: [String]? = nil, nciThesaurusConceptId: String? = nil, name: String? = nil, semanticTypes: [String]? = nil, type: [String]? = nil, ancestors: [String]? = nil, parents: [String]? = nil, assayPurpose: String? = nil) {
self.eligibilityCriterion = eligibilityCriterion
self.inclusionIndicator = inclusionIndicator
self.synonyms = synonyms
self.nciThesaurusConceptId = nciThesaurusConceptId
self.name = name
self.semanticTypes = semanticTypes
self.type = type
self.ancestors = ancestors
self.parents = parents
self.assayPurpose = assayPurpose
}

public enum CodingKeys: String, CodingKey, CaseIterable {
case eligibilityCriterion = "eligibility_criterion"
case inclusionIndicator = "inclusion_indicator"
case synonyms
case nciThesaurusConceptId = "nci_thesaurus_concept_id"
case name
case semanticTypes = "semantic_types"
case type
case ancestors
case parents
case assayPurpose = "assay_purpose"
}

// Encodable protocol methods

public func encode(to encoder: Encoder) throws {
var container = encoder.container(keyedBy: CodingKeys.self)
try container.encodeIfPresent(eligibilityCriterion, forKey: .eligibilityCriterion)
try container.encodeIfPresent(inclusionIndicator, forKey: .inclusionIndicator)
try container.encodeIfPresent(synonyms, forKey: .synonyms)
try container.encodeIfPresent(nciThesaurusConceptId, forKey: .nciThesaurusConceptId)
try container.encodeIfPresent(name, forKey: .name)
try container.encodeIfPresent(semanticTypes, forKey: .semanticTypes)
try container.encodeIfPresent(type, forKey: .type)
try container.encodeIfPresent(ancestors, forKey: .ancestors)
try container.encodeIfPresent(parents, forKey: .parents)
try container.encodeIfPresent(assayPurpose, forKey: .assayPurpose)
}
}

Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,14 @@ public struct Disease: Codable, JSONEncodable, Hashable {
public var synonyms: [String]?
public var nciThesaurusConceptId: String?
public var name: String?
public var type: [String]?
public var parents: [String]?

public init(inclusionIndicator: String? = nil, isLeadDisease: Bool? = nil, synonyms: [String]? = nil, nciThesaurusConceptId: String? = nil, name: String? = nil, type: [String]? = nil, parents: [String]? = nil) {
public init(inclusionIndicator: String? = nil, isLeadDisease: Bool? = nil, synonyms: [String]? = nil, nciThesaurusConceptId: String? = nil, name: String? = nil, parents: [String]? = nil) {
self.inclusionIndicator = inclusionIndicator
self.isLeadDisease = isLeadDisease
self.synonyms = synonyms
self.nciThesaurusConceptId = nciThesaurusConceptId
self.name = name
self.type = type
self.parents = parents
}

Expand All @@ -36,7 +34,6 @@ public struct Disease: Codable, JSONEncodable, Hashable {
case synonyms
case nciThesaurusConceptId = "nci_thesaurus_concept_id"
case name
case type
case parents
}

Expand All @@ -49,7 +46,6 @@ public struct Disease: Codable, JSONEncodable, Hashable {
try container.encodeIfPresent(synonyms, forKey: .synonyms)
try container.encodeIfPresent(nciThesaurusConceptId, forKey: .nciThesaurusConceptId)
try container.encodeIfPresent(name, forKey: .name)
try container.encodeIfPresent(type, forKey: .type)
try container.encodeIfPresent(parents, forKey: .parents)
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
//
// PriorTherapy.swift
//
// Generated by openapi-generator
// https://openapi-generator.tech
//

import Foundation
#if canImport(AnyCodable)
import AnyCodable
#endif

public struct PriorTherapy: Codable, JSONEncodable, Hashable {

public var eligibilityCriterion: String?
public var inclusionIndicator: String?
public var synonyms: [String]?
public var nciThesaurusConceptId: String?
public var name: String?
public var ancestorIds: [String]?
public var parents: [String]?

public init(eligibilityCriterion: String? = nil, inclusionIndicator: String? = nil, synonyms: [String]? = nil, nciThesaurusConceptId: String? = nil, name: String? = nil, ancestorIds: [String]? = nil, parents: [String]? = nil) {
self.eligibilityCriterion = eligibilityCriterion
self.inclusionIndicator = inclusionIndicator
self.synonyms = synonyms
self.nciThesaurusConceptId = nciThesaurusConceptId
self.name = name
self.ancestorIds = ancestorIds
self.parents = parents
}

public enum CodingKeys: String, CodingKey, CaseIterable {
case eligibilityCriterion = "eligibility_criterion"
case inclusionIndicator = "inclusion_indicator"
case synonyms
case nciThesaurusConceptId = "nci_thesaurus_concept_id"
case name
case ancestorIds = "ancestor_ids"
case parents
}

// Encodable protocol methods

public func encode(to encoder: Encoder) throws {
var container = encoder.container(keyedBy: CodingKeys.self)
try container.encodeIfPresent(eligibilityCriterion, forKey: .eligibilityCriterion)
try container.encodeIfPresent(inclusionIndicator, forKey: .inclusionIndicator)
try container.encodeIfPresent(synonyms, forKey: .synonyms)
try container.encodeIfPresent(nciThesaurusConceptId, forKey: .nciThesaurusConceptId)
try container.encodeIfPresent(name, forKey: .name)
try container.encodeIfPresent(ancestorIds, forKey: .ancestorIds)
try container.encodeIfPresent(parents, forKey: .parents)
}
}

Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,15 @@ public struct TrialDetail: Codable, JSONEncodable, Hashable {
public var officialTitle: String?
public var phaseSortOrder: Int?
public var collaborators: [Collaborators]?
public var associatedStudies: [String]?
public var associatedStudies: [AssociatedStudy]?
public var outcomeMeasures: [OutcomeMeasure]?
public var phase: String?
public var centralContact: CentralContact?
public var primaryPurpose: String?
public var numberOfArms: Int?
public var studyProtocolTypeSortOrder: Int?
public var nctId: String?
public var biomarkers: [String]?
public var biomarkers: [Biomarker]?
public var classificationCode: AnyCodable?
public var currentTrialStatusDate: Date?
public var diseases: [Disease]?
Expand All @@ -51,7 +51,7 @@ public struct TrialDetail: Codable, JSONEncodable, Hashable {
public var studyPopulationDescription: AnyCodable?
public var samplingMethodCode: AnyCodable?
public var minimumTargetAccrualNumber: Int?
public var priorTherapy: [String]?
public var priorTherapy: [PriorTherapy]?
public var currentTrialStatusSortOrder: Int?
public var startDate: Date?
public var recordVerificationDate: Date?
Expand All @@ -71,7 +71,7 @@ public struct TrialDetail: Codable, JSONEncodable, Hashable {
public var studySubtypeCode: AnyCodable?
public var studyProtocolType: String?

public init(otherIds: [Identifier]? = nil, amendmentDate: Date? = nil, keywords: AnyCodable? = nil, dcpId: AnyCodable? = nil, interventionalModel: String? = nil, leadOrg: String? = nil, eligibility: Eligibility? = nil, sites: [Site]? = nil, completionDateTypeCode: String? = nil, detailDescription: String? = nil, officialTitle: String? = nil, phaseSortOrder: Int? = nil, collaborators: [Collaborators]? = nil, associatedStudies: [String]? = nil, outcomeMeasures: [OutcomeMeasure]? = nil, phase: String? = nil, centralContact: CentralContact? = nil, primaryPurpose: String? = nil, numberOfArms: Int? = nil, studyProtocolTypeSortOrder: Int? = nil, nctId: String? = nil, biomarkers: [String]? = nil, classificationCode: AnyCodable? = nil, currentTrialStatusDate: Date? = nil, diseases: [Disease]? = nil, primaryPurposeSortOrder: Int? = nil, protocolId: String? = nil, activeSitesCount: Int? = nil, leadOrgCancerCenter: AnyCodable? = nil, arms: [Arm]? = nil, studyModelCode: AnyCodable? = nil, nciId: String? = nil, whyStudyStopped: AnyCodable? = nil, briefSummary: String? = nil, briefTitle: String? = nil, statusHistory: [StatusHistory]? = nil, studyPopulationDescription: AnyCodable? = nil, samplingMethodCode: AnyCodable? = nil, minimumTargetAccrualNumber: Int? = nil, priorTherapy: [String]? = nil, currentTrialStatusSortOrder: Int? = nil, startDate: Date? = nil, recordVerificationDate: Date? = nil, ctepId: String? = nil, currentTrialStatus: String? = nil, studyModelOtherText: AnyCodable? = nil, masking: Masking? = nil, acronym: AnyCodable? = nil, nciPrograms: [String]? = nil, nciFunded: String? = nil, anatomicSites: [String]? = nil, ccrId: AnyCodable? = nil, startDateTypeCode: String? = nil, principalInvestigator: String? = nil, studySource: String? = nil, completionDate: Date? = nil, studySubtypeCode: AnyCodable? = nil, studyProtocolType: String? = nil) {
public init(otherIds: [Identifier]? = nil, amendmentDate: Date? = nil, keywords: AnyCodable? = nil, dcpId: AnyCodable? = nil, interventionalModel: String? = nil, leadOrg: String? = nil, eligibility: Eligibility? = nil, sites: [Site]? = nil, completionDateTypeCode: String? = nil, detailDescription: String? = nil, officialTitle: String? = nil, phaseSortOrder: Int? = nil, collaborators: [Collaborators]? = nil, associatedStudies: [AssociatedStudy]? = nil, outcomeMeasures: [OutcomeMeasure]? = nil, phase: String? = nil, centralContact: CentralContact? = nil, primaryPurpose: String? = nil, numberOfArms: Int? = nil, studyProtocolTypeSortOrder: Int? = nil, nctId: String? = nil, biomarkers: [Biomarker]? = nil, classificationCode: AnyCodable? = nil, currentTrialStatusDate: Date? = nil, diseases: [Disease]? = nil, primaryPurposeSortOrder: Int? = nil, protocolId: String? = nil, activeSitesCount: Int? = nil, leadOrgCancerCenter: AnyCodable? = nil, arms: [Arm]? = nil, studyModelCode: AnyCodable? = nil, nciId: String? = nil, whyStudyStopped: AnyCodable? = nil, briefSummary: String? = nil, briefTitle: String? = nil, statusHistory: [StatusHistory]? = nil, studyPopulationDescription: AnyCodable? = nil, samplingMethodCode: AnyCodable? = nil, minimumTargetAccrualNumber: Int? = nil, priorTherapy: [PriorTherapy]? = nil, currentTrialStatusSortOrder: Int? = nil, startDate: Date? = nil, recordVerificationDate: Date? = nil, ctepId: String? = nil, currentTrialStatus: String? = nil, studyModelOtherText: AnyCodable? = nil, masking: Masking? = nil, acronym: AnyCodable? = nil, nciPrograms: [String]? = nil, nciFunded: String? = nil, anatomicSites: [String]? = nil, ccrId: AnyCodable? = nil, startDateTypeCode: String? = nil, principalInvestigator: String? = nil, studySource: String? = nil, completionDate: Date? = nil, studySubtypeCode: AnyCodable? = nil, studyProtocolType: String? = nil) {
self.otherIds = otherIds
self.amendmentDate = amendmentDate
self.keywords = keywords
Expand Down
3 changes: 3 additions & 0 deletions NCIClinicalTrialsSearchAPI/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ Class | Method | HTTP request | Description
## Documentation For Models

- [Arm](docs/Arm.md)
- [AssociatedStudy](docs/AssociatedStudy.md)
- [Biomarker](docs/Biomarker.md)
- [CentralContact](docs/CentralContact.md)
- [Collaborators](docs/Collaborators.md)
- [Coordinates](docs/Coordinates.md)
Expand All @@ -46,6 +48,7 @@ Class | Method | HTTP request | Description
- [Intervention](docs/Intervention.md)
- [Masking](docs/Masking.md)
- [OutcomeMeasure](docs/OutcomeMeasure.md)
- [PriorTherapy](docs/PriorTherapy.md)
- [Site](docs/Site.md)
- [StatusHistory](docs/StatusHistory.md)
- [StructuredEligibility](docs/StructuredEligibility.md)
Expand Down
11 changes: 11 additions & 0 deletions NCIClinicalTrialsSearchAPI/docs/AssociatedStudy.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# AssociatedStudy

## Properties
Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
**studyIdType** | **String** | | [optional]
**studyId** | **String** | | [optional]

[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)


19 changes: 19 additions & 0 deletions NCIClinicalTrialsSearchAPI/docs/Biomarker.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# Biomarker

## Properties
Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
**eligibilityCriterion** | **String** | | [optional]
**inclusionIndicator** | **String** | | [optional]
**synonyms** | **[String]** | | [optional]
**nciThesaurusConceptId** | **String** | | [optional]
**name** | **String** | | [optional]
**semanticTypes** | **[String]** | | [optional]
**type** | **[String]** | | [optional]
**ancestors** | **[String]** | | [optional]
**parents** | **[String]** | | [optional]
**assayPurpose** | **String** | | [optional]

[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)


1 change: 0 additions & 1 deletion NCIClinicalTrialsSearchAPI/docs/Disease.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ Name | Type | Description | Notes
**synonyms** | **[String]** | | [optional]
**nciThesaurusConceptId** | **String** | | [optional]
**name** | **String** | | [optional]
**type** | **[String]** | | [optional]
**parents** | **[String]** | | [optional]

[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
Expand Down
16 changes: 16 additions & 0 deletions NCIClinicalTrialsSearchAPI/docs/PriorTherapy.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# PriorTherapy

## Properties
Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
**eligibilityCriterion** | **String** | | [optional]
**inclusionIndicator** | **String** | | [optional]
**synonyms** | **[String]** | | [optional]
**nciThesaurusConceptId** | **String** | | [optional]
**name** | **String** | | [optional]
**ancestorIds** | **[String]** | | [optional]
**parents** | **[String]** | | [optional]

[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)


6 changes: 3 additions & 3 deletions NCIClinicalTrialsSearchAPI/docs/TrialDetail.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@ Name | Type | Description | Notes
**officialTitle** | **String** | | [optional]
**phaseSortOrder** | **Int** | | [optional]
**collaborators** | [Collaborators] | | [optional]
**associatedStudies** | **[String]** | | [optional]
**associatedStudies** | [AssociatedStudy] | | [optional]
**outcomeMeasures** | [OutcomeMeasure] | | [optional]
**phase** | **String** | | [optional]
**centralContact** | [**CentralContact**](CentralContact.md) | | [optional]
**primaryPurpose** | **String** | | [optional]
**numberOfArms** | **Int** | | [optional]
**studyProtocolTypeSortOrder** | **Int** | | [optional]
**nctId** | **String** | | [optional]
**biomarkers** | **[String]** | | [optional]
**biomarkers** | [Biomarker] | | [optional]
**classificationCode** | **AnyCodable** | | [optional]
**currentTrialStatusDate** | **Date** | | [optional]
**diseases** | [Disease] | | [optional]
Expand All @@ -42,7 +42,7 @@ Name | Type | Description | Notes
**studyPopulationDescription** | **AnyCodable** | | [optional]
**samplingMethodCode** | **AnyCodable** | | [optional]
**minimumTargetAccrualNumber** | **Int** | | [optional]
**priorTherapy** | **[String]** | | [optional]
**priorTherapy** | [PriorTherapy] | | [optional]
**currentTrialStatusSortOrder** | **Int** | | [optional]
**startDate** | **Date** | | [optional]
**recordVerificationDate** | **Date** | | [optional]
Expand Down
Loading

0 comments on commit 081d931

Please sign in to comment.