Capacities and occupancies for service and program occurrences

backend/models/service/serviceWaitlist.js

@@ -1,19 +1,15 @@
 const {createGraphDBModel, DeleteType, Types} = require("graphdb-utils");
 
-
-
-
 //These might need tweaking, need to figure out what things we need for this model
-const {GDBServiceModel} = require("./service");
-const {GDBClientModel} = require("../ClientFunctionalities/client");
-const { GDBCOModel } = require("../ClientFunctionalities/characteristicOccurrence");
-
+const {GDBServiceOccurrenceModel} = require("./serviceOccurrence");
+const {GDBWaitlistEntryModel} = require("./waitlistEntry");
 
 const GDBServiceWaitlistModel = createGraphDBModel({
 
-    clients: {type: [GDBClientModel], internalKey: ':hasClient'},
-    service: {type: GDBServiceModel, internalKey: ':hasService'},
-    characteristicOccurences: {type: [GDBCOModel], internalKey: ':hasCharacteristicOccurence'}
+
+
+    waitlist: {type: [GDBWaitlistEntryModel], internalKey: ':hasWaitlist'},
+    serviceOccurrence: {type: GDBServiceOccurrenceModel, internalKey: ':hasServiceOccurrence'},
 
 },
 {  

backend/models/service/waitlistEntry.js

@@ -0,0 +1,17 @@
+const {createGraphDBModel, DeleteType, Types} = require("graphdb-utils");
+const { GDBServiceRegistrationModel } = require("../serviceRegistration");
+
+const GDBWaitlistEntryModel = createGraphDBModel({
+
+    serviceRegistration: {type: GDBServiceRegistrationModel, internalKey: ':hasServiceRegistration'},
+    priority: {type: Number, internalKey: ':hasPriority'},
+    date: {type: Date, internalKey: ':hasDate'},
+},
+{  
+    rdfTypes: [':WaitlistEntry'], name: 'waitlistEntry'
+}
+
+);
+module.exports = {
+    GDBWaitlistEntryModel
+  }

backend/services/characteristics/predefined/internalTypes.js

@@ -209,27 +209,65 @@ module.exports = [
 
 
 
-  // below are for servic waitlist
+  // below are for service waitlist
   {
-    name: 'clientForServiceWaitlist',
-    predefinedProperty: 'http://snmi#hasClient',
+    name: 'waitlistForServiceWaitlist',
+    predefinedProperty: 'http://snmi#hasWaitlist',
     formType: 'serviceWaitlist',
     implementation: {
-      label: 'Client',
+      label: 'Waitlist',
       valueDataType: 'owl:NamedIndividual',
       fieldType: FieldTypes.MultiSelectField,
-      optionsFromClass: 'http://snmi#Client'
+      optionsFromClass: 'http://snmi#WaitlistEntry'
     }
   },
   {
-    name: 'serviceForServiceWaitlist',
-    predefinedProperty: 'http://snmi#hasService',
+    name: 'serviceOccurrenceForServiceWaitlist',
+    predefinedProperty: 'http://snmi#hasServiceOccurrence',
     formType: 'serviceWaitlist',
     implementation: {
-      label: 'Service',
+      label: 'ServiceOccurrence',
       valueDataType: 'owl:NamedIndividual',
       fieldType: FieldTypes.SingleSelectField,
-      optionsFromClass: 'http://snmi#Service'
+      optionsFromClass: 'http://snmi#ServiceOccurrence'
+    }
+  },
+
+  //below are for waitlist Entry
+  {
+    name: 'serviceRegistrationForWaitlistEntry',
+    predefinedProperty: 'http://snmi#hasServiceRegistration',
+    formType: 'waitlistEntry',
+    implementation: {
+      label: 'ServiceRegistration',
+      valueDataType: 'owl:NamedIndividual',
+      fieldType: FieldTypes.SingleSelectField,
+      optionsFromClass: 'http://snmi#ServiceRegistration'
+    }
+  },
+
+  //NOTE: has not been tested yet, priority and date below could be wrong
+  {
+    name: 'priorityForWaitlistEntry',
+    predefinedProperty: 'http://snmi#hasPriority',
+    formType: 'waitlistEntry',
+    implementation: {
+      label: 'Priority',
+      valueDataType: 'owl:NamedIndividual',
+      fieldType: FieldTypes.NumberField,
+      optionsFromClass: 'http://snmi#Number'
+    }
+  },
+
+  {
+    name: 'dateForWaitlistEntry',
+    predefinedProperty: 'http://snmi#hasDate',
+    formType: 'waitlistEntry',
+    implementation: {
+      label: 'Date',
+      valueDataType: 'owl:NamedIndividual',
+      fieldType: FieldTypes.DateField,
+      optionsFromClass: 'http://snmi#Date'
     }
   },
 

backend/services/genericData/index.js

@@ -23,6 +23,9 @@ const {GDBServiceOccurrenceModel} = require("../../models/service/serviceOccurre
 const {GDBProgramOccurrenceModel} = require("../../models/program/programOccurrence");
 
 const {GDBServiceWaitlistModel} = require("../../models/service/serviceWaitlist");
+const{GDBWaitlistEntryModel} = require("../../models/service/waitlistEntry");
+
+
 
 const {GDBInternalTypeModel} = require("../../models/internalType");
 const {noQuestion, checkCapacity, setOccupancy, unsetOccupancy} = require('./checkers')
@@ -131,6 +134,9 @@ const {
 } = require("./volunteerInternalTypeTreater");
 const {GDBEligibilityModel} = require("../../models/eligibility");
 const { serviceWaitlistInternalTypeCreateTreater, serviceWaitlistInternalTypeFetchTreater, serviceWaitlistInternalTypeUpdateTreater } = require("./serviceWaitlist");
+const { waitlistEntryInternalTypeCreateTreater, waitlistEntryInternalTypeFetchTreater, waitlistEntryInternalTypeUpdateTreater } = require("./waitlistEntry");
+
+
 const genericType2Model = {
   'client': GDBClientModel,
   'organization': GDBOrganizationModel,
@@ -140,6 +146,7 @@ const genericType2Model = {
   'appointment': GDBAppointmentModel,
   'serviceOccurrence': GDBServiceOccurrenceModel,
   'serviceWaitlist': GDBServiceWaitlistModel,
+  'waitlistEntry' : GDBWaitlistEntryModel,
   'programOccurrence': GDBProgramOccurrenceModel,
   'referral': GDBReferralModel,
   'serviceRegistration': GDBServiceRegistrationModel,
@@ -166,7 +173,8 @@ const genericType2Populates = {
   'service': ['serviceProvider.organization.address', 'serviceProvider.volunteer.address'],
   'program': ['serviceProvider.organization.address', 'serviceProvider.volunteer.address', 'serviceProvider.organization', 'serviceProvider.volunteer', 'manager'],
   'serviceOccurrence': ['address', 'occurrenceOf'],
-  'serviceWaitlist': ['service', 'clients'],
+  'serviceWaitlist': ['waitlist', 'serviceOccurrence'],
+  'waitlistEntry': ['serviceRegistration', 'priority', 'date'],
   'programOccurrence': ['address', 'occurrenceOf'],
   'client': ['address', 'needs'],
   'appointment': ['address', 'referral'],
@@ -182,6 +190,7 @@ const genericType2BeforeCreateChecker = {
   'programOccurrence': [noQuestion, checkCapacity, setOccupancy],
   'programRegistration': [updateOccurrenceOccupancyOnProgramRegistrationCreate],
   'serviceWaitlist': [noQuestion],
+  'waitlistEntry': [noQuestion],
 };
 
 const genericType2BeforeUpdateChecker = {
@@ -192,6 +201,7 @@ const genericType2BeforeUpdateChecker = {
   'programOccurrence': [noQuestion, checkCapacity, unsetOccupancy],
   'programRegistration': [checkProgramOccurrenceUnchanged, updateOccurrenceOccupancyOnProgramRegistrationUpdate],
   'serviceWaitlist': [noQuestion],
+  'waitlistEntry' : [noQuestion],
 };
 
 const genericType2BeforeDeleteChecker = {
@@ -231,7 +241,8 @@ const genericType2InternalTypeCreateTreater = {
   'clientAssessment': clientAssessmentInternalTypeCreateTreater,
   'person': personInternalTypeCreateTreater,
   'volunteer': volunteerInternalTypeCreateTreater,
-  'serviceWaitlist': serviceWaitlistInternalTypeCreateTreater
+  'serviceWaitlist': serviceWaitlistInternalTypeCreateTreater,
+  'waitlistEntry': waitlistEntryInternalTypeCreateTreater
 };
 
 const genericType2InternalTypeFetchTreater = {
@@ -251,7 +262,8 @@ const genericType2InternalTypeFetchTreater = {
   'clientAssessment': clientAssessmentInternalTypeFetchTreater,
   'person': personInternalTypeFetchTreater,
   'volunteer': volunteerInternalTypeFetchTreater,
-  'serviceWaitlist': serviceWaitlistInternalTypeFetchTreater
+  'serviceWaitlist': serviceWaitlistInternalTypeFetchTreater,
+  'waitlistEntry': waitlistEntryInternalTypeFetchTreater
 };
 
 const genericType2InternalTypeUpdateTreater = {
@@ -271,7 +283,8 @@ const genericType2InternalTypeUpdateTreater = {
   'clientAssessment': clientAssessmentInternalTypeUpdateTreater,
   'person': personInternalTypeUpdateTreater,
   'volunteer': volunteerInternalTypeUpdateTreater,
-  'serviceWaitlist': serviceWaitlistInternalTypeUpdateTreater
+  'serviceWaitlist': serviceWaitlistInternalTypeUpdateTreater,
+  'waitlistEntry' : waitlistEntryInternalTypeUpdateTreater
 };
 
 const genericType2AfterCreateTreater = {
@@ -523,6 +536,16 @@ const createSingleGeneric = async (req, res, next) => {
       const newGeneric = genericType2Model[genericType](instanceData);
       await newGeneric.save();
 
+      //create a new waitlist here that corresponds to the serviceOccurrence
+      if(genericType === 'serviceOccurrence'){
+          const occurrenceWaitlist = genericType2Model['serviceWaitllist']({'serviceOccurrence': newGeneric, 'waitlist':[]});
+          //pass in the serviceOccurrence that was just created ("newGeneric").
+          //and an empty list for the queue.
+          await occurrenceWaitlist.save();
+        }
+
+
+
       if (genericType2AfterCreateTreater[genericType])
         await genericType2AfterCreateTreater[genericType](data, req);
 

backend/services/genericData/programRegistration.js

@@ -26,10 +26,13 @@ const updateOccurrenceOccupancyOnProgramRegistrationCreate = async function (cha
   const status = statuses[fields[`characteristic_${PredefinedCharacteristics['Registration Status']._id}`]];
   const occUri = fields['internalType_' + PredefinedInternalTypes['programOccurrenceForProgramRegistration']._id];
   if (!occUri) return;
-  const occ = await GDBProgramOccurrenceModel.findOne({_uri: occUri});
+  const occ = await GDBProgramOccurrenceModel.findOne({_uri: occUri}, {populates: ['characteristicOccurrences']});
   if (status === 'Registered') {
     if (!occ.capacity || (occ.occupancy < occ.capacity)) {
       occ.occupancy += 1;
+      const occupancyC = PredefinedCharacteristics['Occupancy'];
+      const occupancyCO = occ.characteristicOccurrences.find(co => co.occurrenceOf === occupancyC._uri);
+      occupancyCO.dataNumberValue += 1;
       occ.save();
     } else {
       throw new Error('The requested program occurrence is now at capacity. Please refresh the form to review your current options.');
@@ -53,16 +56,20 @@ const updateOccurrenceOccupancyOnProgramRegistrationUpdate = async function (ins
   const newStatus = statuses[fields[`characteristic_${PredefinedCharacteristics['Registration Status']._id}`]];
   const occUri = fields['internalType_' + PredefinedInternalTypes['programOccurrenceForProgramRegistration']._id];
   if (!occUri) return;
-  const occ = await GDBProgramOccurrenceModel.findOne({_uri: occUri});
+  const occ = await GDBProgramOccurrenceModel.findOne({_uri: occUri}, {populates: ['characteristicOccurrences']});
+  const occupancyC = PredefinedCharacteristics['Occupancy'];
+  const occupancyCO = occ.characteristicOccurrences.find(co => co.occurrenceOf === occupancyC._uri);
   if (oldStatus === 'Not Registered' && newStatus === 'Registered') {
     if (!occ.capacity || (occ.occupancy < occ.capacity)) {
       occ.occupancy += 1;
+      occupancyCO.dataNumberValue += 1;
       occ.save();
     } else {
       throw new Error('The requested program occurrence is now at capacity. Please refresh the form to review your current options.');
     }
   } else if (oldStatus === 'Registered' && newStatus === 'Not Registered') {
     occ.occupancy -= 1;
+    occupancyCO.dataNumberValue -= 1;
     occ.save();
     // TODO: Pop one registration from waitlist, if any, and change its status to registered
   } else if (oldStatus === 'Waitlisted' && newStatus === 'Not Registered') { // TODO: Remove this registration from waitlist
@@ -77,9 +84,12 @@ const updateOccurrenceOccupancyOnProgramRegistrationDelete = async function (old
   const status = statuses[oldGeneric.status];
   const occUri = oldGeneric.programOccurrence;
   if (!occUri) return;
-  const occ = await GDBProgramOccurrenceModel.findOne({_uri: occUri});
+  const occ = await GDBProgramOccurrenceModel.findOne({_uri: occUri}, {populates: ['characteristicOccurrences']});
   if (status === 'Registered') {
     occ.occupancy -= 1;
+    const occupancyC = PredefinedCharacteristics['Occupancy'];
+    const occupancyCO = occ.characteristicOccurrences.find(co => co.occurrenceOf === occupancyC._uri);
+    occupancyCO.dataNumberValue -= 1;
     occ.save();
     // TODO: Pop one registration from waitlist, if any, and change its status to registered
   } else if (status === 'Waitlisted') { // TODO: Remove this registration from waitlist

backend/services/genericData/serviceRegistration.js

@@ -40,10 +40,13 @@ const updateOccurrenceOccupancyOnServiceRegistrationCreate = async function (cha
   const status = statuses[fields[`characteristic_${PredefinedCharacteristics['Registration Status']._id}`]];
   const occUri = fields['internalType_' + PredefinedInternalTypes['serviceOccurrenceForServiceRegistration']._id];
   if (!occUri) return;
-  const occ = await GDBServiceOccurrenceModel.findOne({_uri: occUri});
+  const occ = await GDBServiceOccurrenceModel.findOne({_uri: occUri}, {populates: ['characteristicOccurrences']});
   if (status === 'Registered') {
     if (!occ.capacity || (occ.occupancy < occ.capacity)) {
       occ.occupancy += 1;
+      const occupancyC = PredefinedCharacteristics['Occupancy'];
+      const occupancyCO = occ.characteristicOccurrences.find(co => co.occurrenceOf === occupancyC._uri);
+      occupancyCO.dataNumberValue += 1;
       occ.save();
     } else {
       throw new Error('The requested service occurrence is now at capacity. Please refresh the form to review your current options.');
@@ -67,16 +70,20 @@ const updateOccurrenceOccupancyOnServiceRegistrationUpdate = async function (ins
   const newStatus = statuses[fields[`characteristic_${PredefinedCharacteristics['Registration Status']._id}`]];
   const occUri = fields['internalType_' + PredefinedInternalTypes['serviceOccurrenceForServiceRegistration']._id];
   if (!occUri) return;
-  const occ = await GDBServiceOccurrenceModel.findOne({_uri: occUri});
+  const occ = await GDBServiceOccurrenceModel.findOne({_uri: occUri}, {populates: ['characteristicOccurrences']});
+  const occupancyC = PredefinedCharacteristics['Occupancy'];
+  const occupancyCO = occ.characteristicOccurrences.find(co => co.occurrenceOf === occupancyC._uri);
   if (oldStatus === 'Not Registered' && newStatus === 'Registered') {
     if (!occ.capacity || (occ.occupancy < occ.capacity)) {
       occ.occupancy += 1;
+      occupancyCO.dataNumberValue += 1;
       occ.save();
     } else {
       throw new Error('The requested service occurrence is now at capacity. Please refresh the form to review your current options.');
     }
   } else if (oldStatus === 'Registered' && newStatus === 'Not Registered') {
     occ.occupancy -= 1;
+    occupancyCO.dataNumberValue -= 1;
     occ.save();
     // TODO: Pop one registration from waitlist, if any, and change its status to registered
   } else if (oldStatus === 'Waitlisted' && newStatus === 'Not Registered') { // TODO: Remove this registration from waitlist
@@ -91,9 +98,12 @@ const updateOccurrenceOccupancyOnServiceRegistrationDelete = async function (old
   const status = statuses[oldGeneric.status];
   const occUri = oldGeneric.serviceOccurrence;
   if (!occUri) return;
-  const occ = await GDBServiceOccurrenceModel.findOne({_uri: occUri});
+  const occ = await GDBServiceOccurrenceModel.findOne({_uri: occUri}, {populates: ['characteristicOccurrences']});
   if (status === 'Registered') {
     occ.occupancy -= 1;
+    const occupancyC = PredefinedCharacteristics['Occupancy'];
+    const occupancyCO = occ.characteristicOccurrences.find(co => co.occurrenceOf === occupancyC._uri);
+    occupancyCO.dataNumberValue -= 1;
     occ.save();
     // TODO: Pop one registration from waitlist, if any, and change its status to registered
   } else if (status === 'Waitlisted') { // TODO: Remove this registration from waitlist

backend/services/genericData/serviceWaitlist.js

@@ -7,7 +7,7 @@ const serviceWaitlistInternalTypeCreateTreater = async (internalType, instanceDa
   //get the property name from the internalType
   const property = getPredefinedProperty(FORMTYPE, internalType);
   //if the property is client, person or user, then set the value to the instanceData
-  if (property === 'clients' || property === 'service'){
+  if (property === 'waitlist' || property === 'serviceOccurrence'){
     instanceData[property] = value;
   }
 };
@@ -17,7 +17,7 @@ const serviceWaitlistInternalTypeFetchTreater = async (data) => {
   const schema =  data.schema; 
   // for each property in data, if the property is client, person or user, then set the value to the result
   for (const property in data) {
-    if (property === 'clients' || property === 'service') {
+    if (property === 'waitlist' || property === 'serviceOccurrence') {
       const internalType = await GDBInternalTypeModel.findOne({predefinedProperty: schema[property].internalKey, formType: FORMTYPE});
       result[ 'internalType_'+ internalType._id] = SPARQL.ensureFullURI(data[property]);
     }

backend/services/genericData/waitlistEntry.js

@@ -0,0 +1,32 @@
+const {getPredefinedProperty} = require("./helperFunctions");
+const {GDBInternalTypeModel} = require("../../models/internalType");
+const {SPARQL} = require("graphdb-utils");
+const FORMTYPE = 'waitlistEntry'
+
+const waitlistEntryInternalTypeCreateTreater = async (internalType, instanceData, value) => { 
+  //get the property name from the internalType
+  const property = getPredefinedProperty(FORMTYPE, internalType);
+  if (property === 'serviceRegistration' || property === 'priority' || property === 'date'){
+    instanceData[property] = value;
+  }
+};
+
+const waitlistEntryInternalTypeFetchTreater = async (data) => {
+  const result = {};
+  const schema =  data.schema; 
+  for (const property in data) {
+    if (property === 'serviceRegistration' || property === 'priority' || property === 'date') {
+      const internalType = await GDBInternalTypeModel.findOne({predefinedProperty: schema[property].internalKey, formType: FORMTYPE});
+      result[ 'internalType_'+ internalType._id] = SPARQL.ensureFullURI(data[property]);
+    }
+  }
+  return result;
+};
+
+
+const waitlistEntryInternalTypeUpdateTreater = async (internalType, value, result) => {
+  await waitlistEntryInternalTypeCreateTreater(internalType, result, value);
+}
+
+
+module.exports = {waitlistEntryInternalTypeCreateTreater, waitlistEntryInternalTypeFetchTreater, waitlistEntryInternalTypeUpdateTreater}