@universis/accommodation 1.1.1 → 1.1.3

package/src/config/scope.access.js

@@ -1,138 +1,354 @@
 export default [
     {
-        "scope": [
-            "registrar"
+        'scope': [
+            'accommodation'
         ],
-        "resource": "/api/TestActions/?$",
-        "access": [
-            "read",
-            "write"
+        'resource': '/api/users/me',
+        'access': [
+            'read'
         ]
     },
     {
-        "scope": [
-            "registrar"
+        'scope': [
+            'accommodation'
         ],
-        "resource": "/api/AccommodationPlaces/?$",
-        "access": [
-            "read",
-            "write"
+        'resource': '/api/content/private',
+        'access': [
+            'read'
         ]
     },
     {
-        "scope": [
-            "students"
+        'scope': [
+            'accommodation'
         ],
-        "resource": "/api/TestActions/?$",
-        "access": [
-            "read",
-            "write"
+        'resource': '/api/ActionStatusTypes',
+        'access': [
+            'read'
         ]
     },
     {
-        "scope": [
-            "students"
+        'scope': [
+            'accommodation'
         ],
-        "resource": "/api/Accommodations/?$",
-        "access": [
-            "read"
+        'resource': '/api/StudentStatuses',
+        'access': [
+            'read'
         ]
     },
     {
-        "scope": [
-            "students"
+        'scope': [
+            'accommodation'
         ],
-        "resource": "/api/AccommodationRequestActions",
-        "access": [
-            "read",
-            "write"
+        'resource': '/api/StudentCategories',
+        'access': [
+            'read'
         ]
     },
     {
-        "scope": [
-            "students"
+        'scope': [
+            'accommodation'
         ],
-        "resource": "/api/AccommodationRequestEvents",
-        "access": [
-            "read"
+        'resource': '/api/FamilyStatuses',
+        'access': [
+            'read'
         ]
     },
     {
-        "scope": [
-            "students"
+        'scope': [
+            'accommodation'
         ],
-        "resource": "/api/AccommodationRequestCategories",
-        "access": [
-            "read"
+        'resource': '/api/LocalDepartments',
+        'access': [
+            'read'
         ]
     },
     {
-        "scope": [
-            "students"
+        'scope': [
+            'accommodation'
         ],
-        "resource": "/api/StudentAccommodationCards",
-        "access": [
-            "read"
+        'resource': '/api/EventStatusTypes',
+        'access': [
+            'read'
         ]
     },
     {
-        "scope": [
-            "registrar"
+        'scope': [
+            'accommodation'
         ],
-        "resource": "/api/AccommodationRequestActions",
-        "access": [
-            "read",
-            "write"
+        'resource': '/api/JsonAttachments',
+        'access': [
+            'read'
         ]
     },
     {
-        "scope": [
-            "registrar"
+        'scope': [
+            'registrar',
+            'accommodation'
         ],
-        "resource": "/api/AccommodationRequestEvents",
-        "access": [
-            "read",
-            "write"
+        'resource': '/api/AccommodationInscriptionModeTags',
+        'access': [
+            'read',
+            'write'
         ]
     },
     {
-        "scope": [
-            "registrar"
+        'scope': [
+            'accommodation'
         ],
-        "resource": "/api/AccommodationRequestEffectiveStatusTypes",
-        "access": [
-            "read",
-            "write"
+        'resource': '/api/AccommodationRequestActions',
+        'access': [
+            'read',
+            'write'
         ]
     },
     {
-        "scope": [
-            "registrar"
+        'scope': [
+            'accommodation'
         ],
-        "resource": "/api/AccommodationCardEffectiveStatusTypes",
-        "access": [
-            "read",
-            "write"
+        'resource': '/api/SpecialAccommodationRequestActions',
+        'access': [
+            'read',
+            'write'
         ]
     },
     {
-        "scope": [
-            "registrar"
+        'scope': [
+            'accommodation'
         ],
-        "resource": "/api/AccommodationRequestCategories",
-        "access": [
-            "read",
-            "write"
+        'resource': '/api/AccommodationRequestActionMessages',
+        'access': [
+            'read',
+            'write'
         ]
     },
     {
-        "scope": [
-            "registrar"
+        'scope': [
+            'accommodation'
         ],
-        "resource": "/api/StudentAccommodationCards/?$",
-        "access": [
-            "read",
-            "write"
+        'resource': '/api/AccommodationRequestActionReviews',
+        'access': [
+            'read',
+            'write'
+        ]
+    },
+    {
+        'scope': [
+            'accommodation'
+        ],
+        'resource': '/api/AccommodationRequestAttachmentConfigurations',
+        'access': [
+            'read',
+            'write'
+        ]
+    },
+    {
+        'scope': [
+            'registrar',
+            'accommodation'
+        ],
+        'resource': '/api/AccommodationRequestEffectiveStatusTypes',
+        'access': [
+            'read',
+            'write'
+        ]
+    },
+    {
+        'scope': [
+            'accommodation'
+        ],
+        'resource': '/api/AccommodationRequestEvents',
+        'access': [
+            'read',
+            'write'
+        ]
+    },
+    {
+        'scope': [
+            'accommodation'
+        ],
+        'resource': '/api/AcademicYears',
+        'access': [
+            'read'
+        ]
+    },
+    {
+        'scope': [
+            'accommodation'
+        ],
+        'resource': '/api/AcademicPeriods',
+        'access': [
+            'read'
+        ]
+    },
+    {
+        'scope': [
+            'accommodation'
+        ],
+        'resource': '/api/StudentAccommodationCards',
+        'access': [
+            'read',
+            'write'
+        ]
+    },
+    {
+        'scope': [
+            'accommodation'
+        ],
+        'resource': '/api/AccommodationPlaces',
+        'access': [
+            'read',
+            'write'
+        ]
+    },
+    {
+        'scope': [
+            'accommodation'
+        ],
+        'resource': '/api/AccommodationRooms',
+        'access': [
+            'read',
+            'write'
+        ]
+    },
+    {
+        'scope': [
+            'accommodation'
+        ],
+        'resource': '/api/AccommodationConfigurations',
+        'access': [
+            'read',
+            'write'
+        ]
+    },
+    {
+        'scope': [
+            'accommodation'
+        ],
+        'resource': '/api/ReportTemplates',
+        'access': [
+            'read',
+            'write'
+        ]
+    },
+    {
+        'scope': [
+            'accommodation'
+        ],
+        'resource': '/api/AccommodationRequestCategories',
+        'access': [
+            'read',
+            'write'
+        ]
+    },
+    {
+        'scope': [
+            'accommodation'
+        ],
+        'resource': '/api/AccommodationRequestPreferences',
+        'access': [
+            'read'
+        ]
+    },
+    {
+        'scope': [
+            'accommodation'
+        ],
+        'resource': '/api/UpdateAccommodationRequestEventActions',
+        'access': [
+            'read',
+            'write'
+        ]
+    },
+    {
+        'scope': [
+            'accommodation'
+        ],
+        'resource': '/api/RoomTypes',
+        'access': [
+            'read'
+        ]
+    },
+    {
+        'scope': [
+            'accommodation'
+        ],
+        'resource': '/api/Regions',
+        'access': [
+            'read'
+        ]
+    },
+    {
+        'scope': [
+            'accommodation'
+        ],
+        'resource': '/api/Countries',
+        'access': [
+            'read'
+        ]
+    },
+    {
+        'scope': [
+            'accommodation'
+        ],
+        'resource': '/api/Institutes',
+        'access': [
+            'read'
+        ]
+    },
+    {
+        'scope': [
+            'students'
+        ],
+        'resource': '/api/TestActions/?$',
+        'access': [
+            'read',
+            'write'
+        ]
+    },
+    {
+        'scope': [
+            'students'
+        ],
+        'resource': '/api/AccommodationPlaces/?$',
+        'access': [
+            'read'
+        ]
+    },
+    {
+        'scope': [
+            'students'
+        ],
+        'resource': '/api/AccommodationRequestActions',
+        'access': [
+            'read',
+            'write'
+        ]
+    },
+    {
+        'scope': [
+            'students'
+        ],
+        'resource': '/api/AccommodationRequestEvents',
+        'access': [
+            'read'
+        ]
+    },
+    {
+        'scope': [
+            'students'
+        ],
+        'resource': '/api/AccommodationRequestCategories',
+        'access': [
+            'read'
+        ]
+    },
+    {
+        'scope': [
+            'students'
+        ],
+        'resource': '/api/StudentAccommodationCards',
+        'access': [
+            'read'
         ]
     }
 ]

package/src/listeners/OnUpdateAccommodationRoomListener.js

@@ -0,0 +1,150 @@
+
+import { DataError } from '@themost/common';
+
+async function beforeSaveAsync(event) {
+    //
+    if (event.state !== 2) {
+        return;
+    }
+
+    const context = event.model.context;
+    const target = event.target;
+    const previous = event.previous;
+
+    if (previous == null) {
+        throw new DataError('E_PREVIOUS', 'The previous state of the object cannot be determined');
+    }
+
+    const previousActionStatus = await context.model('ActionStatusType').find(previous.cardStatus).select('alternateName').value();
+    const targetActionStatus = await context.model('ActionStatusType').find(event.target.cardStatus).select('alternateName').value();
+
+    if (previousActionStatus === 'CompletedActionStatus' && targetActionStatus === 'ActiveActionStatus') {
+        target.accommodationRoom = null
+    }
+
+    if (Object.prototype.hasOwnProperty.call(target, 'accommodationRoom') === true) {
+        const targetAccommodationRoom = target.accommodationRoom?.id || target.accommodationRoom;
+
+        if (previous.accommodationRoom !== targetAccommodationRoom && targetAccommodationRoom != null && previous.accommodationRoom != null) {
+
+            if (targetActionStatus !== 'CompletedActionStatus') {
+                throw new DataError('E_STATE', 'The accommodation room cannot be changed for inactive accommodation card');
+            }
+
+            target.cancelReason = target.cancelReason || context.translate('Change Room');
+            target.dateCancelled = target.dateCancelled || new Date();
+            target.validThrough = target.dateCancelled;
+
+        }
+    }
+}
+
+async function afterSaveAsync(event) {
+
+    if (event.state !== 2) {
+        return;
+    }
+
+    const previous = event.previous;
+    if (previous == null) {
+        throw new DataError('E_PREVIOUS', 'The previous state of the object cannot be determined');
+    }
+
+    const target = event.target;
+
+    if (Object.prototype.hasOwnProperty.call(target, 'accommodationRoom') === false) {
+        return;
+    }
+
+
+    const context = event.model.context;
+    const previousActionStatus = await context.model('ActionStatusType').find(previous.cardStatus).select('alternateName').value();
+    const targetActionStatus = await context.model('ActionStatusType').find(event.target.cardStatus).select('alternateName').value();
+    const targetAccommodationRoom = target.accommodationRoom?.id || target.accommodationRoom;
+
+    if (previousActionStatus === 'CompletedActionStatus' && targetActionStatus === 'ActiveActionStatus' && previous.accommodationRoom != null) {
+        // update previous room occupancy
+        await calculateOccupancy(context, previous.accommodationRoom);
+    }
+
+    if (['CompletedActionStatus', 'ActiveActionStatus'].includes(previousActionStatus) && targetActionStatus === 'CancelledActionStatus') {
+        // on cancel student accommodation card status
+            await calculateOccupancy(context, targetAccommodationRoom);
+    }
+
+    if (['CompletedActionStatus', 'ActiveActionStatus'].includes(previousActionStatus) && targetActionStatus === 'CompletedActionStatus') {
+        
+
+        if (previous.accommodationRoom === targetAccommodationRoom) {
+            return;
+        }
+
+        if (previousActionStatus === 'CompletedActionStatus') {
+            const newCard = {
+                action: previous.action,
+                student: previous.student,
+                accommodationRoom: targetAccommodationRoom,
+                academicYear: previous.academicYear,
+                validFrom: target.validThrough,
+                validThrough: previous.validThrough,
+                cardStatus: {
+                    alternateName: 'CompletedActionStatus'
+                }
+
+            }
+
+            await context.model('StudentAccommodationCards').save(newCard);
+        }
+
+        await calculateOccupancy(context, targetAccommodationRoom);
+
+        if (previous.accommodationRoom != null) {
+            await calculateOccupancy(context, previous.accommodationRoom);
+        }
+    }
+}
+
+async function calculateOccupancy(context, accommodationRoom) {
+    
+    const currentOccupancy = await context.model('StudentAccommodationCard')
+        .where('accommodationRoom').equal(accommodationRoom)
+        .and('isActive').equal(1)
+        .select('count(id) as total', 'accommodationRoom/occupancy as maxOccupancy')
+        .groupBy('accommodationRoom/occupancy')
+        .silent()
+        .getItem();
+
+    const totalOccupancy= (currentOccupancy && currentOccupancy.total ) || 0;
+    if (totalOccupancy && totalOccupancy > currentOccupancy.maxOccupancy) {
+        throw new DataError('E_STATE', 'No room space for new resident');
+    }
+
+    await context.model('AccommodationRoom').save({
+        id: accommodationRoom,
+        currentOccupancy: totalOccupancy
+    });
+}
+
+/**
+ * @param {DataEventArgs} event
+ * @param {Function} callback
+ */
+export function beforeSave(event, callback) {
+    return beforeSaveAsync(event).then(() => {
+        return callback();
+    }).catch((err) => {
+        return callback(err);
+    });
+}
+
+/**
+ * @param {DataEventArgs} event
+ * @param {Function} callback
+ */
+export function afterSave(event, callback) {
+    return afterSaveAsync(event).then(() => {
+        return callback();
+    }).catch((err) => {
+        return callback(err);
+    });
+}

package/src/listeners/StudentAccommodationCardSaveListener.js

@@ -13,7 +13,15 @@ export function beforeSave(event, callback) {
             /**
              * @type {Student|DataObject|*}
              */
-            const student = context.model('Student').convert(event.target.student);
+            const previous = event.previous;
+            let student = context.model('Student').convert(event.target.student);
+            if (!student){
+                if (previous){
+                    student = context.model('Student').convert(previous.student);
+                }else{
+                    throw new DataError('ERR_STATUS','Student cannot be found');
+                }
+            }
             // const isActive = await student.silent().isActive();
             const isActive = await student.is(':active');
             if (!isActive) {
@@ -23,8 +31,6 @@ export function beforeSave(event, callback) {
                     'Student', 'studentStatus');
             }
             
-            const studentObject = await context.model('Student').where('id').equal(student.id).silent().flatten().getItem();
-            
             const academicYear = context.model('AcademicYear').convert(event.target.academicYear).getId();
             if (Number.isInteger(academicYear) === false) {
                 throw new DataError('E_VALUE', 'Invalid academic year. Expected number.', null, 'AcademicYear', 'id');