Capacities and occupancies for service and program occurrences

backend/config/index.js

@@ -6,7 +6,7 @@ if (isProduction)
 
 const config = {
   graphdb: {
-    addr: isProduction ? 'http://localhost:7200' : `http://${isDocker ? 'host.docker.internal' : 'localhost'}:7200`,
+    addr: isProduction ? 'http://127.0.0.1:7200' : `http://${isDocker ? 'host.docker.internal' : '127.0.0.1'}:7200`,
   },
   mongodb: {
     addr: isProduction ? 'mongodb://localhost:27017/snmi' : `mongodb://localhost:27017/${process.env.test ? "snmiTest" : "snmi"}`

backend/loaders/express.js

@@ -88,6 +88,9 @@ app.use('/public', partnerNetworkPublicRoute);
   await initOptions('Appointment Statuses',
     ["Requested", "Confirmed", "Cancelled", "Fulfilled", "Client No Show", "Postponed"],
     'AppointmentStatus', 'appointmentStatus');
+  await initOptions('Service and Program Occurrence Statuses',
+    ["Registered", "Not Registered", "Waitlisted"],
+    'OccurrenceStatus', 'occurrenceStatus');
 })()
 
 

backend/models/program/programOccurrence.js

@@ -15,6 +15,9 @@ const GDBProgramOccurrenceModel = createGraphDBModel({
   needSatisfiers: {type: [GDBNeedSatisfierModel], internalKey: ':hasNeedSatisfier'},
   // needSatisfierOccurrence: {type: [GDBNeedSatisfierOccurrenceModel], internalKey: ':hasNeedSatisfierOccurrence', onDelete: DeleteType.CASCADE},
   description: {type: String, internalKey: 'cids:hasDescription'},
+  capacity: {type: Number, internalKey: ':hasCapacity'},
+  occupancy: {type: Number, internalKey: ':hasOccupancy'},
+  status: {type: String, internalKey: ':hasOccurrenceStatus'},
   characteristicOccurrences: {type: [GDBCOModel], internalKey: ':hasCharacteristicOccurrence'}
 }, {
   rdfTypes: [':ProgramOccurrence'], name: 'programOccurrence'

backend/models/service/serviceOccurrence.js

@@ -15,6 +15,9 @@ const GDBServiceOccurrenceModel = createGraphDBModel({
   needSatisfiers: {type: [GDBNeedSatisfierModel], internalKey: ':hasNeedSatisfier'},
   // needSatisfierOccurrence: {type: [GDBNeedSatisfierOccurrenceModel], internalKey: ':hasNeedSatisfierOccurrence', onDelete: DeleteType.CASCADE},
   description: {type: String, internalKey: 'cids:hasDescription'},
+  capacity: {type: Number, internalKey: ':hasCapacity'},
+  occupancy: {type: Number, internalKey: ':hasOccupancy'},
+  status: {type: String, internalKey: ':hasOccurrenceStatus'},
   characteristicOccurrences: {type: [GDBCOModel], internalKey: ':hasCharacteristicOccurrence'}
 }, {
   rdfTypes: [':ServiceOccurrence'], name: 'serviceOccurrence'

backend/models/service/serviceWaitlist.js

@@ -0,0 +1,26 @@
+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 GDBServiceWaitlistModel = createGraphDBModel({
+
+    clients: {type: [GDBClientModel], internalKey: ':hasClient'},
+    service: {type: GDBServiceModel, internalKey: ':hasService'},
+    characteristicOccurences: {type: [GDBCOModel], internalKey: ':hasCharacteristicOccurence'}
+
+},
+{  
+    rdfTypes: [':ServiceWaitlist'], name: 'serviceWaitlist'
+}
+
+);
+module.exports = {
+    GDBServiceWaitlistModel
+  }

backend/services/characteristics/predefined/general.js

@@ -82,4 +82,35 @@ module.exports = [{
       fieldType: FieldTypes.NumberField,
     },
   },
+  {
+    name: 'Capacity',
+    description: 'The capacity of a program or service occurrence.',
+    predefinedProperty: 'http://snmi#hasCapacity',
+    implementation: {
+      label: 'Capacity',
+      valueDataType: 'xsd:number',
+      fieldType: FieldTypes.NumberField,
+    },
+  },
+  {
+    name: 'Occupancy',
+    description: 'The current occupancy of a program or service occurrence.',
+    predefinedProperty: 'http://snmi#hasOccupancy',
+    implementation: {
+      label: 'Occupancy',
+      valueDataType: 'xsd:number',
+      fieldType: FieldTypes.NumberField,
+    },
+  },
+  {
+    name: 'Occurrence Status',
+    description: 'The status of a program or service occurrence.',
+    predefinedProperty: 'http://snmi#hasOccurrenceStatus',
+    implementation: {
+      label: 'Occurrence Status',
+      valueDataType: 'xsd:string',
+      fieldType: FieldTypes.SingleSelectField,
+      optionsFromClass: ':OccurrenceStatus'
+    }
+  },
 ]

backend/services/characteristics/predefined/internalTypes.js

@@ -207,6 +207,35 @@ module.exports = [
     }
   },
 
+
+
+  // below are for servic waitlist
+  {
+    name: 'clientForServiceWaitlist',
+    predefinedProperty: 'http://snmi#hasClient',
+    formType: 'serviceWaitlist',
+    implementation: {
+      label: 'Client',
+      valueDataType: 'owl:NamedIndividual',
+      fieldType: FieldTypes.MultiSelectField,
+      optionsFromClass: 'http://snmi#Client'
+    }
+  },
+  {
+    name: 'serviceForServiceWaitlist',
+    predefinedProperty: 'http://snmi#hasService',
+    formType: 'serviceWaitlist',
+    implementation: {
+      label: 'Service',
+      valueDataType: 'owl:NamedIndividual',
+      fieldType: FieldTypes.SingleSelectField,
+      optionsFromClass: 'http://snmi#Service'
+    }
+  },
+
+
+
+
   // below are for program Provision
   {
     name: 'needOccurrenceForProgramProvision',

backend/services/genericData/checkers.js

@@ -1,8 +1,27 @@
+const {GDBCharacteristicModel} = require("../../models");
 const {Server400Error} = require("../../utils");
+const {PredefinedCharacteristics} = require("../characteristics");
 
 function noQuestion(characteristics, questions) {
   if (Object.keys(questions).length > 0)
     throw new Server400Error('Service should not contain question.');
 }
 
-module.exports = {noQuestion}
+function checkCapacity(characteristics, questions, fields) {
+  const capacityId = Object.keys(characteristics).find(id => characteristics[id].name === 'Capacity');
+  if (!!capacityId) {
+    if (fields['characteristic_' + capacityId] < 0) {
+      throw new Server400Error('Capacity must be zero or greater.');
+    }
+  }
+}
+
+async function setOccupancy(characteristics, questions, fields) {
+  const occupancyId = PredefinedCharacteristics['Occupancy']._id;
+  const occupancyCharacteristic = await GDBCharacteristicModel.findOne({_id: occupancyId},
+                                                                       {populates: ['implementation']});
+  characteristics[occupancyId] = occupancyCharacteristic;
+  fields[`characteristic_${occupancyId}`] = '0';
+}
+
+module.exports = {noQuestion, checkCapacity, setOccupancy}

backend/services/genericData/index.js

@@ -21,8 +21,11 @@ const {GDBAppointmentModel} = require("../../models/appointment");
 const {GDBPersonModel} = require("../../models/person");
 const {GDBServiceOccurrenceModel} = require("../../models/service/serviceOccurrence");
 const {GDBProgramOccurrenceModel} = require("../../models/program/programOccurrence");
+
+const {GDBServiceWaitlistModel} = require("../../models/service/serviceWaitlist");
+
 const {GDBInternalTypeModel} = require("../../models/internalType");
-const {noQuestion} = require('./checkers')
+const {noQuestion, checkCapacity, setOccupancy} = require('./checkers')
 const {
   serviceOccurrenceInternalTypeCreateTreater, serviceOccurrenceInternalTypeFetchTreater,
   serviceOccurrenceInternalTypeUpdateTreater
@@ -123,6 +126,7 @@ const {
   afterDeleteVolunteer
 } = require("./volunteerInternalTypeTreater");
 const {GDBEligibilityModel} = require("../../models/eligibility");
+const { serviceWaitlistInternalTypeCreateTreater, serviceWaitlistInternalTypeFetchTreater, serviceWaitlistInternalTypeUpdateTreater } = require("./serviceWaitlist");
 const genericType2Model = {
   'client': GDBClientModel,
   'organization': GDBOrganizationModel,
@@ -131,6 +135,7 @@ const genericType2Model = {
   'program': GDBProgramModel,
   'appointment': GDBAppointmentModel,
   'serviceOccurrence': GDBServiceOccurrenceModel,
+  'serviceWaitlist': GDBServiceWaitlistModel,
   'programOccurrence': GDBProgramOccurrenceModel,
   'referral': GDBReferralModel,
   'serviceRegistration': GDBServiceRegistrationModel,
@@ -157,18 +162,28 @@ 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'],
   'programOccurrence': ['address', 'occurrenceOf'],
   'client': ['address', 'needs'],
   'appointment': ['address', 'referral'],
   'person': ['address'],
   'volunteer': ['partnerOrganizations', 'organization', 'address'],
 };
 
-const genericType2Checker = {
-    'service': noQuestion,
-    'serviceOccurrence': noQuestion,
-    'programOccurrence': noQuestion,
-    'program': noQuestion
+const genericType2BeforeCreateChecker = {
+  'service': [noQuestion],
+  'serviceOccurrence': [noQuestion, checkCapacity, setOccupancy],
+  'programOccurrence': [noQuestion, checkCapacity, setOccupancy],
+  'program': [noQuestion],
+  'serviceWaitlist': [noQuestion],
+};
+
+const genericType2BeforeUpdateChecker = {
+  'service': [noQuestion],
+  'serviceOccurrence': [noQuestion, checkCapacity],
+  'programOccurrence': [noQuestion, checkCapacity],
+  'program': [noQuestion],
+  'serviceWaitlist': [noQuestion],
 };
 
 
@@ -203,7 +218,8 @@ const genericType2InternalTypeCreateTreater = {
   'outcomeOccurrence': outcomeOccurrenceInternalTypeCreateTreater,
   'clientAssessment': clientAssessmentInternalTypeCreateTreater,
   'person': personInternalTypeCreateTreater,
-  'volunteer': volunteerInternalTypeCreateTreater
+  'volunteer': volunteerInternalTypeCreateTreater,
+  'serviceWaitlist': serviceWaitlistInternalTypeCreateTreater
 };
 
 const genericType2InternalTypeFetchTreater = {
@@ -222,7 +238,9 @@ const genericType2InternalTypeFetchTreater = {
   'outcomeOccurrence': outcomeOccurrenceInternalTypeFetchTreater,
   'clientAssessment': clientAssessmentInternalTypeFetchTreater,
   'person': personInternalTypeFetchTreater,
-  'volunteer': volunteerInternalTypeFetchTreater
+  'volunteer': volunteerInternalTypeFetchTreater,
+  'serviceWaitlist': serviceWaitlistInternalTypeFetchTreater
+
 };
 
 const genericType2InternalTypeUpdateTreater = {
@@ -241,7 +259,8 @@ const genericType2InternalTypeUpdateTreater = {
   'outcomeOccurrence': outcomeOccurrenceInternalTypeUpdateTreater,
   'clientAssessment': clientAssessmentInternalTypeUpdateTreater,
   'person': personInternalTypeUpdateTreater,
-  'volunteer': volunteerInternalTypeUpdateTreater
+  'volunteer': volunteerInternalTypeUpdateTreater,
+  'serviceWaitlist': serviceWaitlistInternalTypeUpdateTreater
 };
 
 const genericType2AfterCreateTreater = {
@@ -416,8 +435,9 @@ const createSingleGenericHelper = async (data, genericType) => {
 
   // extract questions and characteristics based on fields from the database
   await fetchCharacteristicQuestionsInternalTypesBasedOnForms(characteristics, questions, internalTypes, data.fields);
-  if (genericType2Checker[genericType])
-    genericType2Checker[genericType](characteristics, questions);
+  if (genericType2BeforeCreateChecker[genericType])
+    for (const checker of genericType2BeforeCreateChecker[genericType])
+      await checker(characteristics, questions, data.fields);
 
   const instanceData = {characteristicOccurrences: [], questionOccurrences: []};
   // iterating over all fields and create occurrences and store them into instanceData
@@ -535,6 +555,10 @@ async function updateSingleGenericHelper(genericId, data, genericType) {
   const internalTypes = {};
   await fetchCharacteristicQuestionsInternalTypesBasedOnForms(characteristics, questions, internalTypes, data.fields);
 
+  if (genericType2BeforeUpdateChecker[genericType])
+    for (const checker of genericType2BeforeUpdateChecker[genericType])
+      await checker(characteristics, questions, data.fields);
+
   // check should we update or create a characteristicOccurrence or questionOccurrence
   // in other words, is there a characteristicOccurrence/questionOccurrence belong to this user,
   // and related to the characteristic/question

backend/services/genericData/serviceWaitlist.js

@@ -0,0 +1,34 @@
+const {getPredefinedProperty} = require("./helperFunctions");
+const {GDBInternalTypeModel} = require("../../models/internalType");
+const {SPARQL} = require("graphdb-utils");
+const FORMTYPE = 'serviceWaitlist'
+
+const serviceWaitlistInternalTypeCreateTreater = async (internalType, instanceData, value) => { 
+  //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'){
+    instanceData[property] = value;
+  }
+};
+
+const serviceWaitlistInternalTypeFetchTreater = async (data) => {
+  const result = {};
+  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') {
+      const internalType = await GDBInternalTypeModel.findOne({predefinedProperty: schema[property].internalKey, formType: FORMTYPE});
+      result[ 'internalType_'+ internalType._id] = SPARQL.ensureFullURI(data[property]);
+    }
+  }
+  return result;
+};
+
+
+const serviceWaitlistInternalTypeUpdateTreater = async (internalType, value, result) => {
+  await serviceWaitlistInternalTypeCreateTreater(internalType, result, value);
+}
+
+
+module.exports = {serviceWaitlistInternalTypeCreateTreater, serviceWaitlistInternalTypeFetchTreater, serviceWaitlistInternalTypeUpdateTreater}

frontend/src/components/ServiceWaitlists.js

@@ -0,0 +1,69 @@
+import React from 'react';
+import { Link } from './shared';
+import { GenericPage } from "./shared";
+import { deleteSingleGeneric, fetchMultipleGeneric, fetchSingleGeneric } from "../api/genericDataApi";
+import {getAddressCharacteristicId} from "./shared/CharacteristicIds";
+
+const TYPE = 'serviceWaitlist';
+
+const columnsWithoutOptions = [
+  {
+    label: 'Service Name',
+    body: ({service}) => <Link color to={`/${TYPE}/${service?._id}/edit`}>{service?.name}</Link>
+
+  },
+  {
+    label: 'Clients Waitlisted',
+    body: ({clients}) => clients ? clients.length : 0
+  },
+  // {
+  //   label: 'Category',
+  //   body: ({category}) => category
+  // }
+];
+
+export default function ServiceWaitlists() {
+
+  const nameFormatter = serviceWaitlist => {
+    if (serviceWaitlist.description) {
+      return serviceWaitlist.description;
+    } else {
+      return 'Service Waitlist ' + serviceWaitlist._id;
+    }
+  }
+
+  const linkFormatter = serviceWaitlist => `/${TYPE}/${serviceWaitlist._id}`;
+
+  const fetchData = async () => {
+    const addressCharacteristicId = await getAddressCharacteristicId();
+    const serviceWaitlists = (await fetchMultipleGeneric(TYPE)).data;
+    console.log(serviceWaitlists)
+    const data = [];
+    for (const serviceWaitlist of serviceWaitlists) {
+      const serviceWaitlistData = {_id: serviceWaitlist._id};
+      if (serviceWaitlist.clients)
+        serviceWaitlistData.clients = serviceWaitlist.clients;
+      if (serviceWaitlist.service)
+        serviceWaitlistData.service = serviceWaitlist.service;
+      data.push(serviceWaitlistData);
+    }
+    return data;
+  };
+
+  const deleteService = (id) => deleteSingleGeneric('serviceWaitlist', id);
+
+  return (
+    <GenericPage
+      type={TYPE}
+      title={"Service Waitlists"}
+      columnsWithoutOptions={columnsWithoutOptions}
+      fetchData={fetchData}
+      deleteItem={deleteService}
+      nameFormatter={nameFormatter}
+      linkFormatter={linkFormatter}
+      tableOptions={{
+        idField: '_id'
+      }}
+    />
+  );
+}