PROD-2707: Field renames from `nantum-api`

__tests__/unit/modules/nantum-responses.js

@@ -7,7 +7,7 @@ const sampleEvent1 = {
     notification_duration_seconds: 86400,
     ramp_up_duration_seconds: 3600,
     start_tolerance_duration_seconds: 0,
-    start_date: '2020-07-10T00:00:00Z',
+    start_time: '2020-07-10T00:00:00Z',
   },
   cancelled: false,
   company: 'cyberdyne',
@@ -25,7 +25,7 @@ const sampleEvent1 = {
         signal_type: 'setpoint',
         current_value: 45.5,
         duration_seconds: 1800,
-        start_date: '2020-07-10T00:00:00.000Z',
+        start_time: '2020-07-10T00:00:00.000Z',
         intervals: [
           {
             duration_seconds: 1740,
@@ -78,7 +78,7 @@ const sampleEvent1 = {
           ac: true,
         },
       },
-      start_date: '2020-07-10T00:00:00Z',
+      start_time: '2020-07-10T00:00:00Z',
     },
   },
   targets: [
@@ -93,7 +93,7 @@ const sampleEvent1 = {
 
 const sampleVen1 = {
   dis: 'Test VEN 1',
-  oadr_ven_registrationId: '123123123123123123129999',
+  oadr_utility_ven_registrationId: '123123123123123123129999',
   company: 'cyberdyne',
   created_at: new Date(),
 };

__tests__/unit/utils/fake-nantum-module.js

@@ -35,8 +35,8 @@ class FakeNantumModule {
 
   async getEventResponse(ven, eventId, modificationNumber) {
     return _.find(this.eventResponses, {
-      oadr_ven_id: ven._id,
-      oadr_event_id: eventId,
+      oadr_utility_ven_id: ven._id,
+      oadr_utility_event_id: eventId,
       modification_number: modificationNumber,
     })[0];
   }
@@ -57,11 +57,11 @@ class FakeNantumModule {
     };
   }
 
-  markEventAsSeen(oadrVenRegistrationId, eventId, modificationNumber) {
+  markEventAsSeen(oadrUtilityVenRegistrationId, eventId, modificationNumber) {
     const newSeenEvent = {
       _id: v4(),
-      oadr_ven_registration_id: oadrVenRegistrationId,
-      oadr_event_id: eventId,
+      oadr_utility_ven_registration_id: oadrUtilityVenRegistrationId,
+      oadr_utility_event_id: eventId,
       modification_number: modificationNumber
     };
     this.seenEvents.push(newSeenEvent);
@@ -69,13 +69,13 @@ class FakeNantumModule {
 
   async getSeenEvents(venRegistrationId) {
     return _.filter(this.seenEvents, {
-      oadr_ven_registration_id: venRegistrationId,
+      oadr_utility_ven_registration_id: venRegistrationId,
     });
   }
 
   async getVen(venRegistrationId) {
     return _.filter(this.seenEvents, {
-      oadr_ven_registration_id: venRegistrationId,
+      oadr_utility_ven_registration_id: venRegistrationId,
     })[0];
   }
 
@@ -89,7 +89,7 @@ class FakeNantumModule {
 
   async getVenReports(venRegistrationId) {
     return _.find(this.venReports, {
-      oadr_ven_registration_id: venRegistrationId,
+      oadr_utility_ven_registration_id: venRegistrationId,
     });
   }
 

__tests__/util/provision-ven.js

@@ -39,7 +39,7 @@ async function generateEventForVen1(venId) {
           'signal_type': 'setpoint',
           'current_value': 45.5,
           'duration_seconds': 1800,
-          'start_date': new Date(eventStartMillis).toISOString(),
+          'start_time': new Date(eventStartMillis).toISOString(),
           'intervals': [
             {
               'duration_seconds': 1740,
@@ -76,24 +76,24 @@ async function generateEventForVen1(venId) {
       'ramp_up_duration_seconds': 3600,
       'recovery_duration_seconds': 0,
       'start_tolerance_duration_seconds': 0,
-      'start_date': new Date(eventStartMillis).toISOString()
+      'start_time': new Date(eventStartMillis).toISOString()
     }
   };
 
   // create test event
   const newEvent = await request({
     method: 'POST',
-    uri: `${nantumUrl}/oadr_events`,
+    uri: `${nantumUrl}/oadr_utility_events`,
     body: event,
   });
 
   // create event ven mapping
   await request({
     method: 'POST',
-    uri: `${nantumUrl}/oadr_event_vens`,
+    uri: `${nantumUrl}/oadr_utility_event_vens`,
     body: {
-      oadr_event_id: newEvent[0]._id,
-      oadr_ven_id: venId,
+      oadr_utility_event_id: newEvent[0]._id,
+      oadr_utility_ven_id: venId,
     },
   });
 }
@@ -116,7 +116,7 @@ async function generateEventForVen2(venId) {
           'signal_type': 'setpoint',
           'current_value': 47.5,
           'duration_seconds': 1800,
-          'start_date': new Date(eventStartMillis).toISOString(),
+          'start_time': new Date(eventStartMillis).toISOString(),
           'intervals': [
             {
               'duration_seconds': 1740,
@@ -153,24 +153,24 @@ async function generateEventForVen2(venId) {
       'ramp_up_duration_seconds': 3600,
       'recovery_duration_seconds': 0,
       'start_tolerance_duration_seconds': 0,
-      'start_date': new Date(eventStartMillis).toISOString()
+      'start_time': new Date(eventStartMillis).toISOString()
     }
   };
 
   // create test event
   const newEvent = await request({
     method: 'POST',
-    uri: `${nantumUrl}/oadr_events`,
+    uri: `${nantumUrl}/oadr_utility_events`,
     body: event,
   });
 
   // create event ven mapping
   await request({
     method: 'POST',
-    uri: `${nantumUrl}/oadr_event_vens`,
+    uri: `${nantumUrl}/oadr_utility_event_vens`,
     body: {
-      oadr_event_id: newEvent[0]._id,
-      oadr_ven_id: venId,
+      oadr_utility_event_id: newEvent[0]._id,
+      oadr_utility_ven_id: venId,
     },
   });
 }
@@ -226,26 +226,26 @@ async function getVenClient() {
     'ven.js1',
   );
 
-  // register VEN, this will create an oadr_ven_registrations
+  // register VEN, this will create an oadr_utility_ven_registrations
   await ven.register();
 
-  // retrieve the oadr_ven_registration_id
+  // retrieve the oadr_utility_ven_registration_id
   const registrations = await request({
-    uri: `${nantumUrl}/oadr_ven_registrations`,
+    uri: `${nantumUrl}/oadr_utility_ven_registrations`,
     query: {
       client_certificate_fingerprint: fingerprint,
     },
   });
 
-  const oadrVenRegistrationId = registrations[0]._id;
+  const oadrUtilityVenRegistrationId = registrations[0]._id;
 
   // create the VEN tied to the ven registration
   const newVen = await request({
     method: 'POST',
-    uri: `${nantumUrl}/oadr_vens`,
+    uri: `${nantumUrl}/oadr_utility_vens`,
     body: {
       dis: `VEN ${fingerprint}`,
-      oadr_ven_registration_id: oadrVenRegistrationId
+      oadr_utility_ven_registration_id: oadrUtilityVenRegistrationId
     },
   });
 

modules/nantum.js

@@ -9,7 +9,7 @@ const { request } = API({ company, logger });
 
 async function getVenRegistration(clientCertificateFingerprint) {
   const results = await request({
-    uri: `${nantumUrl}/oadr_ven_registrations`,
+    uri: `${nantumUrl}/oadr_utility_ven_registrations`,
     query: {
       client_certificate_fingerprint: clientCertificateFingerprint,
     },
@@ -20,7 +20,7 @@ async function getVenRegistration(clientCertificateFingerprint) {
 async function createVenRegistration(ven) {
   await request({
     method: 'POST',
-    uri: `${nantumUrl}/oadr_ven_registrations`,
+    uri: `${nantumUrl}/oadr_utility_ven_registrations`,
     body: ven,
   });
 }
@@ -28,25 +28,25 @@ async function createVenRegistration(ven) {
 async function deleteVenRegistration(id) {
   await request({
     method: 'DELETE',
-    uri: `${nantumUrl}/oadr_ven_registrations/${id}`
+    uri: `${nantumUrl}/oadr_utility_ven_registrations/${id}`
   });
 }
 
-async function getVenReports(oadrVenRegistrationId) {
+async function getVenReports(oadrUtilityVenRegistrationId) {
   const results = await request({
-    uri: `${nantumUrl}/oadr_ven_reports`,
+    uri: `${nantumUrl}/oadr_utility_ven_reports`,
     query: {
-      oadr_ven_registration_id: oadrVenRegistrationId,
+      oadr_utility_ven_registration_id: oadrUtilityVenRegistrationId,
     },
   });
   return results[0];
 }
 
-async function getSeenEvents(oadrVenRegistrationId) {
+async function getSeenEvents(oadrUtilityVenRegistrationId) {
   const results = await request({
-    uri: `${nantumUrl}/oadr_ven_seen_events`,
+    uri: `${nantumUrl}/oadr_utility_ven_seen_events`,
     query: {
-      oadr_ven_registration_id: oadrVenRegistrationId,
+      oadr_utility_ven_registration_id: oadrUtilityVenRegistrationId,
     },
   });
   return results;
@@ -55,7 +55,7 @@ async function getSeenEvents(oadrVenRegistrationId) {
 async function updateVenReports(id, reports) {
   await request({
     method: 'PUT',
-    uri: `${nantumUrl}/oadr_ven_reports/${id}`,
+    uri: `${nantumUrl}/oadr_utility_ven_reports/${id}`,
     body: { reports },
   });
 }
@@ -63,17 +63,17 @@ async function updateVenReports(id, reports) {
 async function createVenReports(venReports) {
   await request({
     method: 'POST',
-    uri: `${nantumUrl}/oadr_ven_reports`,
+    uri: `${nantumUrl}/oadr_utility_ven_reports`,
     body: venReports,
   });
 }
 
 async function getEventResponse(venId, eventId, modificationNumber) {
   const results = await request({
-    uri: `${nantumUrl}/oadr_event_responses`,
+    uri: `${nantumUrl}/oadr_utility_event_responses`,
     query: {
-      oadr_ven_id: venId,
-      oadr_event_id: eventId,
+      oadr_utility_ven_id: venId,
+      oadr_utility_event_id: eventId,
       modification_number: modificationNumber,
     },
   });
@@ -83,7 +83,7 @@ async function getEventResponse(venId, eventId, modificationNumber) {
 async function createEventResponse(eventResponse) {
   await request({
     method: 'POST',
-    uri: `${nantumUrl}/oadr_event_responses`,
+    uri: `${nantumUrl}/oadr_utility_event_responses`,
     body: eventResponse,
   });
 }
@@ -91,18 +91,18 @@ async function createEventResponse(eventResponse) {
 async function updateEventResponse(oadrEventResponseId, newProperties) {
   await request({
     method: 'PUT',
-    uri: `${nantumUrl}/oadr_event_responses/${oadrEventResponseId}`,
+    uri: `${nantumUrl}/oadr_utility_event_responses/${oadrEventResponseId}`,
     body: newProperties,
   });
 }
 
-async function markEventAsSeen(oadrVenRegistrationId, eventId, modificationNumber) {
+async function markEventAsSeen(oadrUtilityVenRegistrationId, eventId, modificationNumber) {
   await request({
     method: 'POST',
-    uri: `${nantumUrl}/oadr_ven_seen_events`,
+    uri: `${nantumUrl}/oadr_utility_ven_seen_events`,
     body: {
-      oadr_ven_registration_id: oadrVenRegistrationId,
-      oadr_event_id: eventId,
+      oadr_utility_ven_registration_id: oadrUtilityVenRegistrationId,
+      oadr_utility_event_id: eventId,
       modification_number: modificationNumber
     },
   });
@@ -113,16 +113,16 @@ async function getEvents(venRegistrationId) {
   if (!ven) return []; // no ven: no events
 
   const eventVens = await request({
-    uri: `${nantumUrl}/oadr_event_vens`,
+    uri: `${nantumUrl}/oadr_utility_event_vens`,
     query: {
-      oadr_ven_id: ven._id
+      oadr_utility_ven_id: ven._id
     },
   });
 
-  const eventIds = eventVens.map(eventVen => eventVen.oadr_event_id);
+  const eventIds = eventVens.map(eventVen => eventVen.oadr_utility_event_id);
 
   return await request({
-    uri: `${nantumUrl}/oadr_events`,
+    uri: `${nantumUrl}/oadr_utility_events`,
     query: {
       _id: eventIds
     },
@@ -139,9 +139,9 @@ async function sendReportReadings(ven, readings) {
 
 async function getVen(venRegistrationId) {
   const results = await request({
-    uri: `${nantumUrl}/oadr_vens`,
+    uri: `${nantumUrl}/oadr_utility_vens`,
     query: {
-      oadr_ven_registration_id: venRegistrationId,
+      oadr_utility_ven_registration_id: venRegistrationId,
     },
   });
   return results[0];

processes/event.js

@@ -81,7 +81,7 @@ function calculateEventSignals(signals) {
       signalType: signal.signal_type,
       currentValue: signal.current_value,
       duration: calculateOadrDuration(signal.duration_seconds),
-      startDate: signal.start_date,
+      startDate: signal.start_time,
       intervals: calculateEventIntervals(signal.intervals),
       itemBase: calculateItemBase(signal.item_base),
     };
@@ -94,7 +94,7 @@ function calculateBaselineSignal(nantumBaseline) {
     baselineName: nantumBaseline.baseline_name,
     baselineId: nantumBaseline.baseline_id,
     duration: calculateOadrDuration(nantumBaseline.duration_seconds),
-    startDate: nantumBaseline.start_date,
+    startDate: nantumBaseline.start_time,
     intervals: calculateEventIntervals(nantumBaseline.intervals),
   };
 }
@@ -104,13 +104,13 @@ function convertToOadrEvent(event) {
     eventDescriptor: {
       eventId: event._id,
       modificationNumber: event.modification_number,
-      modificationDateTime: event.modification_date,
+      modificationDateTime: event.modification_time,
       modificationReason: event.modification_reason,
       marketContext: event.market_context,
       createdDateTime: event.created_at,
       vtnComment: event.dis,
       eventStatus: calculateEventStatus(
-        event.active_period.start_date,
+        event.active_period.start_time,
         event.active_period.duration_seconds,
         event.active_period.notification_duration_seconds,
         event.active_period.ramp_up_duration_seconds,
@@ -120,7 +120,7 @@ function convertToOadrEvent(event) {
       priority: event.priority,
     },
     activePeriod: {
-      startDate: event.active_period.start_date,
+      startDate: event.active_period.start_time,
       duration: calculateOadrDuration(event.active_period.duration_seconds),
       notificationDuration: calculateOadrDuration(
         event.active_period.notification_duration_seconds,
@@ -268,8 +268,8 @@ async function updateOptType(
         });
       } else {
         await nantum.createEventResponse({
-          oadr_event_id: eventResponse.eventId,
-          oadr_ven_id: ven._id,
+          oadr_utility_event_id: eventResponse.eventId,
+          oadr_utility_ven_id: ven._id,
           modification_number: eventResponse.modificationNumber,
           opt_type: eventResponse.optType,
         });
@@ -296,7 +296,7 @@ function eventHasBeenSeenByVen(seenEvents, event) {
   return (
     seenEvents.filter(
       seenEvent =>
-        seenEvent.oadr_event_id === event.eventDescriptor.eventId &&
+        seenEvent.oadr_utility_event_id === event.eventDescriptor.eventId &&
         seenEvent.modification_number ===
           event.eventDescriptor.modificationNumber,
     ).length > 0

processes/report.js

@@ -191,7 +191,7 @@ async function registerReports(
     await nantum.updateVenReports(venReports._id, venReportMetadata);
   } else {
     await nantum.createVenReports({
-      oadr_ven_registration_id: ven._id,
+      oadr_utility_ven_registration_id: ven._id,
       reports: venReportMetadata
     });
   }