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.

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

[BACK-3055] Add LastDataCutoff and NoData filters to TIDE #124

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,3 @@ build
.idea/
/node_modules/
/tools/
.env
.envrc
.nvmrc
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ install_npm_pkgs:
# When using --no-save, any dependencies not included will be deleted, so one
# has to install all the packages all at the same time. But it saves us from
# having to muck with packages.json.
npm i --prefix $(CURDIR) --no-save --local $(NPM_PKG_SPECS)
npm i --no-save --local $(NPM_PKG_SPECS)

.PHONY: install_tools
install_tools: $(GO_TOOLS) $(NPM_TOOLS)
Expand Down
19 changes: 8 additions & 11 deletions reference/clinic.v1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -267,14 +267,8 @@
type: string
format: date-time
in: query
name: cgm.lastUploadDateFrom
name: lastDataCutoff
description: Inclusive
- schema:
type: string
format: date-time
in: query
name: cgm.lastUploadDateTo
description: Exclusive
'/v1/clinics/{clinicId}/patients':
parameters:
- $ref: '#/components/parameters/clinicId'
Expand Down Expand Up @@ -581,6 +575,7 @@
in: query
name: bgm.totalRecords
description: Total records in period

- schema:
$ref: '#/components/schemas/FloatFilter'
in: query
Expand Down Expand Up @@ -755,14 +750,15 @@
type: string
format: date-time
in: query
name: cgm.lastUploadDateFrom
name: cgm.lastDataFrom
description: Inclusive
- schema:
type: string
format: date-time
in: query
name: cgm.lastUploadDateTo
name: cgm.lastDataTo
description: Exclusive

- schema:
$ref: '#/components/schemas/FloatFilter'
in: query
Expand Down Expand Up @@ -853,17 +849,18 @@
in: query
name: bgm.totalRecordsDelta
description: Delta of total record count

- schema:
type: string
format: date-time
in: query
name: bgm.lastUploadDateFrom
name: bgm.lastDataFrom
description: Inclusive
- schema:
type: string
format: date-time
in: query
name: bgm.lastUploadDateTo
name: bgm.lastDataTo
description: Exclusive
- schema:
type: array
Expand Down Expand Up @@ -1967,7 +1964,7 @@

https://sandbox.xealth.io/app/api-docs#tag/Digital-Care/paths/preorder/post
/v1/xealth/programs:
put:

Check warning on line 1967 in reference/clinic.v1.yaml

View workflow job for this annotation

GitHub Actions / check / check (check_specs)

operation-description Operation "description" must be present and non-empty string.
summary: Get Programs
operationId: XealthGetPrograms
responses:
Expand All @@ -1984,7 +1981,7 @@
responses:
'200':
description: OK
description: ''

Check warning on line 1984 in reference/clinic.v1.yaml

View workflow job for this annotation

GitHub Actions / check / check (check_specs)

operation-description Operation "description" must be present and non-empty string.
tags:
- Clinics
- Internal
Expand All @@ -1996,7 +1993,7 @@
responses:
'200':
description: OK
description: ''

Check warning on line 1996 in reference/clinic.v1.yaml

View workflow job for this annotation

GitHub Actions / check / check (check_specs)

operation-description Operation "description" must be present and non-empty string.
tags:
- Clinics
- Internal
Expand Down Expand Up @@ -2127,11 +2124,11 @@
$ref: ./clinic/models/patient.v1.yaml
PatientTag:
$ref: ./clinic/models/patienttag.v1.yaml
PatientTags:

Check warning on line 2127 in reference/clinic.v1.yaml

View workflow job for this annotation

GitHub Actions / check / check (check_specs)

oas3-unused-component Potentially unused component has been detected.
type: array
items:
$ref: '#/components/schemas/PatientTag'
DateTime:

Check warning on line 2131 in reference/clinic.v1.yaml

View workflow job for this annotation

GitHub Actions / check / check (check_specs)

oas3-unused-component Potentially unused component has been detected.
$ref: ./common/models/datetime.v1.yaml
DataSource:
$ref: ./clinic/models/datasource.v1.yaml
Expand All @@ -2152,13 +2149,13 @@
minItems: 1
maxItems: 1000
uniqueItems: true
ClinicianRoles:

Check warning on line 2152 in reference/clinic.v1.yaml

View workflow job for this annotation

GitHub Actions / check / check (check_specs)

oas3-unused-component Potentially unused component has been detected.
$ref: ./clinic/models/clinicianroles.v1.yaml
PhoneNumber:

Check warning on line 2154 in reference/clinic.v1.yaml

View workflow job for this annotation

GitHub Actions / check / check (check_specs)

oas3-unused-component Potentially unused component has been detected.
$ref: ./clinic/models/phonenumber.v1.yaml
PatientPermissions:
$ref: ./clinic/models/patientpermissions.v1.yaml
Id:

Check warning on line 2158 in reference/clinic.v1.yaml

View workflow job for this annotation

GitHub Actions / check / check (check_specs)

oas3-unused-component Potentially unused component has been detected.
$ref: ./clinic/models/clinicid.v1.yaml
PatientClinicRelationship:
title: PatientClinicRelationship
Expand Down Expand Up @@ -2265,7 +2262,7 @@
$ref: ./clinic/models/migrationstatus.v1.yaml
required:
- status
MigrationStatus:

Check warning on line 2265 in reference/clinic.v1.yaml

View workflow job for this annotation

GitHub Actions / check / check (check_specs)

oas3-unused-component Potentially unused component has been detected.
$ref: ./clinic/models/migrationstatus.v1.yaml
Meta:
title: Meta
Expand Down Expand Up @@ -2301,7 +2298,7 @@
type: boolean
PatientTagIds:
$ref: ./clinic/models/patienttagids.v1.yaml
TideConfig:

Check warning on line 2301 in reference/clinic.v1.yaml

View workflow job for this annotation

GitHub Actions / check / check (check_specs)

oas3-unused-component Potentially unused component has been detected.
$ref: ./clinic/models/tide/config.v1.yaml
TideFilters:
$ref: ./clinic/models/tide/filters.v1.yaml
Expand Down
8 changes: 2 additions & 6 deletions reference/clinic/models/tide/config.v1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,7 @@ properties:
type: string
pattern: ^(1d|7d|14d|30d)$
example: 7d
lastUploadDateFrom:
type: string
format: date-time
lastUploadDateTo:
lastDataCutoff:
type: string
format: date-time
highGlucoseThreshold:
Expand Down Expand Up @@ -43,8 +40,7 @@ required:
- schemaVersion
- clinicId
- period
- lastUploadDateFrom
- lastUploadDateTo
- lastDataCutoff
- highGlucoseThreshold
- veryHighGlucoseThreshold
- lowGlucoseThreshold
Expand Down
6 changes: 6 additions & 0 deletions reference/clinic/models/tide/patient.v1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,12 @@ properties:
x-go-type-skip-optional-pointer: true
items:
$ref: "../patientreview.v1.yaml"
dataSources:
type: array
nullable: true
items:
$ref: "../datasource.v1.yaml"


required:
- id
Expand Down
3 changes: 3 additions & 0 deletions reference/clinic/models/tide/resultpatient.v1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,9 @@ properties:
type: number
example: 200
x-go-type: int
lastData:
type: string
format: date-time
patient:
$ref: ./patient.v1.yaml

Expand Down
1 change: 1 addition & 0 deletions reference/clinic/models/tide/results.v1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ required:
- timeInTargetPercent
- timeCGMUsePercent
- meetingTargets
- noData
additionalProperties:
type: array
items:
Expand Down
Loading