diff --git a/eeg_backend/src/main/resources/application-dev.yml b/eeg_backend/src/main/resources/application-dev.yml index 1b46e33..360b3f5 100644 --- a/eeg_backend/src/main/resources/application-dev.yml +++ b/eeg_backend/src/main/resources/application-dev.yml @@ -1,6 +1,14 @@ spring: jpa: show-sql: true + servlet: + multipart: + max-file-size: 50MB + max-request-size: 50MB + timeout: + http: + connect: 300000 + read: 300000 jwt: secret: dev-only-secret-do-not-use-in-production-2025 app: diff --git a/eeg_frontend/angular.json b/eeg_frontend/angular.json index 3a786a4..4c5d8ec 100644 --- a/eeg_frontend/angular.json +++ b/eeg_frontend/angular.json @@ -72,7 +72,10 @@ } }, "test": { - "builder": "@angular/build:unit-test" + "builder": "@angular/build:unit-test", + "options": { + "runnerConfig": "vitest.config.ts" + } } } } diff --git a/eeg_frontend/openapi.yaml b/eeg_frontend/openapi.yaml index e5345c4..3cd0687 100644 --- a/eeg_frontend/openapi.yaml +++ b/eeg_frontend/openapi.yaml @@ -703,6 +703,31 @@ paths: '*/*': schema: $ref: "#/components/schemas/UserStats" + /api/dashboard/user/metering-data/overview: + get: + tags: + - dashboard-controller + operationId: getMeteringDataOverview + parameters: + - name: from + in: query + required: true + schema: + type: string + format: date-time + - name: to + in: query + required: true + schema: + type: string + format: date-time + responses: + "200": + description: OK + content: + '*/*': + schema: + $ref: "#/components/schemas/MeteringDataOverview" /api/dashboard/admin: get: tags: @@ -1502,6 +1527,45 @@ components: pendingMemberships: type: integer format: int64 + MeteringDataOverview: + type: object + properties: + meteringPoints: + type: array + items: + $ref: "#/components/schemas/MeteringPointSummary" + timeSeries: + type: array + items: + $ref: "#/components/schemas/TimeSeriesEntry" + MeteringPointSummary: + type: object + properties: + id: + type: string + format: uuid + atNumber: + type: string + type: + type: string + enum: + - CONSUMER + - PRODUCER + - PROSUMER + totalKwh: + type: number + format: double + TimeSeriesEntry: + type: object + properties: + timestamp: + type: string + format: date-time + values: + type: object + additionalProperties: + type: number + format: double AdminStats: type: object properties: