Merge #117 into alpha

Author: LesterLyu

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`,
     repositoryName: process.env.GRAPHDB_REPO || (process.env.test ? "snmiTest" : "snmi")
   },
   mongodb: {

backend/loaders/express.js

@@ -95,6 +95,9 @@ app.use('/api', partnerOrganizationRoute);
   await initOptions('Appointment Statuses',
     ["Requested", "Confirmed", "Cancelled", "Fulfilled", "Client No Show", "Postponed"],
     'AppointmentStatus', 'appointmentStatus');
+  await initOptions('Service and Program Registration Statuses',
+    ["Registered", "Not Registered", "Waitlisted"],
+    'RegistrationStatus', 'registrationStatus');
 })()
 
 

backend/models/program/programOccurrence.js

@@ -15,6 +15,8 @@ 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'},
   characteristicOccurrences: {type: [GDBCOModel], internalKey: ':hasCharacteristicOccurrence'}
 }, {
   rdfTypes: [':ProgramOccurrence'], name: 'programOccurrence'

backend/models/program/programWaitlist.js

@@ -0,0 +1,18 @@
+const {createGraphDBModel, DeleteType, Types} = require("graphdb-utils");
+
+//These might need tweaking, need to figure out what things we need for this model
+const {GDBProgramOccurrenceModel} = require("./programOccurrence");
+const {GDBProgramWaitlistEntryModel} = require("./programWaitlistEntry");
+
+const GDBProgramWaitlistModel = createGraphDBModel({
+  waitlist: {type: [GDBProgramWaitlistEntryModel], internalKey: ':hasWaitlist'},
+  programOccurrence: {type: GDBProgramOccurrenceModel, internalKey: ':hasProgramOccurrence'},
+},
+{  
+  rdfTypes: [':ProgramWaitlist'], name: 'programWaitlist'
+}
+
+);
+module.exports = {
+  GDBProgramWaitlistModel
+}

backend/models/program/programWaitlistEntry.js

@@ -0,0 +1,16 @@
+const {createGraphDBModel, DeleteType, Types} = require("graphdb-utils");
+const {GDBProgramRegistrationModel} = require("../programRegistration");
+
+const GDBProgramWaitlistEntryModel = createGraphDBModel({
+  programRegistration: {type: GDBProgramRegistrationModel, internalKey: ':hasProgramRegistration'},
+  priority: {type: Number, internalKey: ':hasPriority'},
+  date: {type: Date, internalKey: ':hasDate'},
+},
+{  
+  rdfTypes: [':ProgramWaitlistEntry'], name: 'programWaitlistEntry'
+}
+
+);
+module.exports = {
+  GDBProgramWaitlistEntryModel
+}

backend/models/programRegistration.js

@@ -1,4 +1,4 @@
-const {createGraphDBModel, DeleteType, Types, getGraphDBModel} = require("graphdb-utils");
+const {createGraphDBModel, DeleteType, Types} = require("graphdb-utils");
 const {GDBProgramOccurrenceModel} = require("./program/programOccurrence");
 const {GDBClientModel} = require("./ClientFunctionalities/client");
 const {GDBReferralModel} = require("./referral");
@@ -13,6 +13,7 @@ const GDBProgramRegistrationModel = createGraphDBModel({
   client: {type: GDBClientModel, internalKey: ':hasClient'},
   referral: {type: GDBReferralModel, internalKey: ':hasReferral'},
   appointment: {type: GDBAppointmentModel, internalKey: ':hasAppointment'},
+  status: {type: String, internalKey: ':hasRegistrationStatus'},
   characteristicOccurrences: {type: [GDBCOModel], internalKey: ':hasCharacteristicOccurrence'},
   address: {type: GDBAddressModel, internalKey: 'ic:hasAddress', onDelete: DeleteType.CASCADE},
 }, {

backend/models/service/serviceOccurrence.js

@@ -15,6 +15,8 @@ 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'},
   characteristicOccurrences: {type: [GDBCOModel], internalKey: ':hasCharacteristicOccurrence'}
 }, {
   rdfTypes: [':ServiceOccurrence'], name: 'serviceOccurrence'

backend/models/service/serviceWaitlist.js

@@ -0,0 +1,18 @@
+const {createGraphDBModel, DeleteType, Types} = require("graphdb-utils");
+
+//These might need tweaking, need to figure out what things we need for this model
+const {GDBServiceOccurrenceModel} = require("./serviceOccurrence");
+const {GDBServiceWaitlistEntryModel} = require("./serviceWaitlistEntry");
+
+const GDBServiceWaitlistModel = createGraphDBModel({
+  waitlist: {type: [GDBServiceWaitlistEntryModel], internalKey: ':hasWaitlist'},
+  serviceOccurrence: {type: GDBServiceOccurrenceModel, internalKey: ':hasServiceOccurrence'},
+},
+{  
+  rdfTypes: [':ServiceWaitlist'], name: 'serviceWaitlist'
+}
+
+);
+module.exports = {
+  GDBServiceWaitlistModel
+}

backend/models/service/serviceWaitlistEntry.js

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

backend/models/serviceRegistration.js

@@ -13,6 +13,7 @@ const GDBServiceRegistrationModel = createGraphDBModel({
   client: {type: GDBClientModel, internalKey: ':hasClient'},
   referral: {type: GDBReferralModel, internalKey: ':hasReferral'},
   appointment: {type: GDBAppointmentModel, internalKey: ':hasAppointment'},
+  status: {type: String, internalKey: ':hasRegistrationStatus'},
   characteristicOccurrences: {type: [GDBCOModel], internalKey: ':hasCharacteristicOccurrence'},
   address: {type: GDBAddressModel, internalKey: 'ic:hasAddress', onDelete: DeleteType.CASCADE},
 }, {