diff --git a/src/enum/dacc.enum.ts b/src/enum/dacc.enum.ts index 3a77a3a193168b27ab3d8d7d0fcbca9c82df905e..ed189b78cedb7066e9efd405f1f70a87cd61d414 100644 --- a/src/enum/dacc.enum.ts +++ b/src/enum/dacc.enum.ts @@ -10,5 +10,5 @@ export enum DaccEvent { EVENT_DURATION = 'event-duration', QUIZ_STARS = 'quiz-stars', SUMMARY_SUBSCRIPTION_MONTHLY = 'summary-subscription-monthly', - ELECTRICITY_HALF_HOUR_DATA = 'electricity-half-hour-data', + FLUID_DATA_GRANULARITY = 'fluid-data-granularity-monthly', } diff --git a/src/targets/services/aggregatorUsageEvents.ts b/src/targets/services/aggregatorUsageEvents.ts index ef3bb1124fdd0a44dc3c68cea12284d40fabe21e..7ce143995bcbfdff645f3e2cc2a8ea41ffce5c37 100644 --- a/src/targets/services/aggregatorUsageEvents.ts +++ b/src/targets/services/aggregatorUsageEvents.ts @@ -18,6 +18,7 @@ import { UsageEventProperties } from 'enum/usageEventProperties.enum' import ChallengeService from 'services/challenge.service' import { UserChallengeState } from 'enum/userChallenge.enum' import ProfileTypeEntityService from 'services/profileTypeEntity.service' +import TermsService from 'services/terms.service' const log = logger.namespace('aggregatorUsageEvents') @@ -596,7 +597,11 @@ const sendHalfHourConsumption = async (client: Client) => { const halfHourConsumption: Indicator = { createdBy: 'ecolyo', - measureName: DaccEvent.ELECTRICITY_HALF_HOUR_DATA, + measureName: DaccEvent.FLUID_DATA_GRANULARITY, + // eslint-disable-next-line @typescript-eslint/camelcase + group1: { fluid_type: 'electricity' }, + // eslint-disable-next-line @typescript-eslint/camelcase + group2: { granularity: 'half_hour' }, startDate: DateTime.local() .setZone('utc', { keepLocalTime: true, @@ -920,6 +925,13 @@ const AggregatorUsageEvents = async ({ client, }: AggregatorUsageEventsProps) => { log('info', 'Launch service') + log('info', 'Dacc consent validation...') + const termService = new TermsService(client) + if (!(await termService.getLastTerm())) { + log('info', 'Exit: no consent available') + return + } + const events: UsageEvent[] = await UsageEventService.getEvents(client, { aggregated: false, eventDate: {