add noData tide category, add lastDataCutoff filter

.gitignore

@@ -4,6 +4,3 @@ build
 .idea/
 /node_modules/
 /tools/
-.env
-.envrc
-.nvmrc

Makefile

@@ -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)

reference/clinic.v1.yaml

@@ -267,14 +267,8 @@ paths:
             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'
@@ -756,13 +750,13 @@ paths:
             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:
@@ -855,18 +849,18 @@ paths:
           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
@@ -2069,24 +2063,6 @@ paths:
         - Clinics
         - Internal
       x-internal: true
-  '/v1/clinics/{clinicId}/reports/merge':
-    parameters:
-      - $ref: '#/components/parameters/clinicId'
-    post:
-      summary: Generate Clinic Merge Report
-      operationId: GenerateMergeReport
-      responses:
-        '200':
-          description: OK
-      description: Generates a spreadsheet report for merging two clinics
-      tags:
-        - Clinics
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/GenerateMergeReport'
-        description: ''
 components:
   schemas:
     Error:
@@ -2458,16 +2434,6 @@ components:
         - client_secret
     ScheduledReports:
       $ref: ./clinic/models/scheduledreports.v1.yaml
-    GenerateMergeReport:
-      title: GenerateMergeReport
-      x-stoplight:
-        id: 3oq18sasrzo0o
-      type: object
-      properties:
-        sourceId:
-          $ref: ./clinic/models/clinicid.v1.yaml
-      required:
-        - sourceId
   securitySchemes:
     sessionToken:
       name: x-tidepool-session-token

reference/clinic/models/tide/config.v1.yaml

@@ -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:
@@ -43,8 +40,7 @@ required:
   - schemaVersion
   - clinicId
   - period
-  - lastUploadDateFrom
-  - lastUploadDateTo
+  - lastDataCutoff
   - highGlucoseThreshold
   - veryHighGlucoseThreshold
   - lowGlucoseThreshold

reference/clinic/models/tide/resultpatient.v1.yaml

@@ -62,6 +62,9 @@ properties:
     type: number
     example: 200
     x-go-type: int
+  lastData:
+    type: string
+    format: date-time
   patient:
     $ref: ./patient.v1.yaml
 

reference/clinic/models/tide/results.v1.yaml

@@ -8,6 +8,7 @@ required:
   - timeInTargetPercent
   - timeCGMUsePercent
   - meetingTargets
+  - noData
 additionalProperties:
   type: array
   items: