test: add test for lastWeek chart

Author: coderbyheart

features/HistoricalRequest.feature.md

@@ -177,6 +177,52 @@ Soon I should receive a message on the websocket that is equal to
 }
 ```
 
+## Request historical data for a week
+
+When I connect to the websocket using fingerprint `${fingerprint}`
+
+And I send this message via the websocket
+
+```json
+{
+  "message": "message",
+  "payload": {
+    "@context": "https://github.com/hello-nrfcloud/proto/historical-data-request",
+    "@id": "cc270d6b-725c-4033-ac64-c5dae903f73d",
+    "type": "lastWeek",
+    "message": "battery",
+    "attributes": {
+      "min": { "attribute": "%", "aggregate": "min" }
+    }
+  }
+}
+```
+
+<!-- @retry:tries=5,initialDelay=1000,delayFactor=2 -->
+
+Given I store
+`$toMillis($join([$substring($fromMillis(ts), 0, 13), ":00:00Z"]))` into
+`lastHour`
+
+Soon I should receive a message on the websocket that is equal to
+
+```json
+{
+  "@context": "https://github.com/hello-nrfcloud/proto/historical-data-response",
+  "@id": "cc270d6b-725c-4033-ac64-c5dae903f73d",
+  "type": "lastWeek",
+  "message": "battery",
+  "attributes": {
+    "min": [
+      {
+        "%": 18,
+        "ts": "$number{lastHour}"
+      }
+    ]
+  }
+}
+```
+
 ## Verify I will get error message if the request is invalid
 
 When I connect to the websocket using fingerprint `${fingerprint}`

historicalData/historicalDataRepository.ts

@@ -27,7 +27,7 @@ export const HistoricalChartTypes = {
 	},
 	lastWeek: {
 		bin: '1hour',
-		duration: '1week',
+		duration: '7day',
 		expires: '5minutes',
 	},
 	lastMonth: {

historicalData/queryGenerator.spec.ts

@@ -62,7 +62,7 @@ describe('queryGenerator', () => {
 
 			request.type = 'lastWeek'
 			expect(getStartPeriod(request, 1688104200000)).toEqual(
-				'from_milliseconds(1688104200000) - 1week',
+				'from_milliseconds(1688104200000) - 7day',
 			)
 
 			request.type = 'lastMonth'
@@ -257,6 +257,43 @@ describe('queryGenerator', () => {
 			expect(result.replace(/\s+/g, ' ').trim()).toEqual(expectedQuery)
 		})
 
+		it('returns the correct query statement for weekly battery request', () => {
+			request.message = 'battery'
+			request.type = 'lastWeek'
+			request.attributes = {
+				min: { attribute: '%', aggregate: 'min' },
+			}
+
+			const deviceId = 'device123'
+			const context = new URL(
+				'https://github.com/hello-nrfcloud/proto/transformed/model/battery',
+			)
+			const historicalDataDatabaseName = 'database1'
+			const historicalDataTableName = 'table1'
+
+			const result = getQueryStatement({
+				request,
+				deviceId,
+				context,
+				historicalDataDatabaseName,
+				historicalDataTableName,
+			})
+
+			const expectedQuery = `
+				SELECT deviceId, bin(time, 1hour) as time, min(measure_value::double) as "min"
+				FROM "database1"."table1"
+				WHERE deviceId = 'device123'
+				AND "@context" = 'https://github.com/hello-nrfcloud/proto/transformed/model/battery'
+				AND time BETWEEN from_milliseconds(1688104200000) - 7day AND from_milliseconds(1688104200000)
+				GROUP BY deviceId, bin(time, 1hour)
+				ORDER BY bin(time, 1hour) DESC
+			`
+				.replace(/\s+/g, ' ')
+				.trim()
+
+			expect(result.replace(/\s+/g, ' ').trim()).toEqual(expectedQuery)
+		})
+
 		it('returns the correct query statement for location request', () => {
 			request.message = 'location'
 			request.type = 'lastMonth'

package-lock.json

@@ -117,7 +117,7 @@
   "prettier": "@nordicsemiconductor/asset-tracker-cloud-code-style/.prettierrc",
   "dependencies": {
     "@aws-lambda-powertools/metrics": "1.11.1",
-    "@hello.nrfcloud.com/proto": "3.0.4",
+    "@hello.nrfcloud.com/proto": "3.1.0",
     "@middy/core": "4.5.5",
     "@nordicsemiconductor/from-env": "2.0.0",
     "@nordicsemiconductor/timestream-helpers": "5.0.0",