@universis/accommodation 1.1.2 → 1.1.5

package/src/config/models/StudentAccommodationCard.json

@@ -5,7 +5,7 @@
   "title": "StudentAccommodationCard",
   "hidden": false,
   "sealed": false,
-  "version": "1.5",
+  "version": "1.9",
   "source": "StudentAccommodationCardBase",
   "view": "StudentAccommodationCardData",
   "classPath": "./models/StudentAccommodationCard",
@@ -16,14 +16,14 @@
       "description": "Ο κωδικός της εγγραφής",
       "type": "Counter",
       "primary": true
-    },   
+    },
     {
       "name": "action",
       "title": "Action",
       "description": "The action associated with this card.",
       "type": "AccommodationRequestAction",
       "nullable": false
-    },    
+    },
     {
       "name": "student",
       "title": "Φοιτητής",
@@ -47,80 +47,75 @@
       "type": "AcademicYear",
       "expandable": true,
       "nullable": false
-  },
- 
-  {
-    "name": "serialNumber",
-    "title": "Number",
-    "type": "Integer",
-    "nullable": false,
-    "value": "javascript:return this.newid();"
-  },
-  {
-    "name": "dateCreated",
-    "title": "Date Created",
-    "description": "The date on which this item was created.",
-    "type": "DateTime",
-    "value": "javascript:return (new Date());",
-    "readonly": true
-  },
-  {
-    "@id": "http://schema.org/validFrom",
-    "name": "validFrom",
-    "title": "validFrom",
-    "description": "The date when the item becomes valid.",
-    "type": "DateTime",
-    "nullable": false
-  },
-  {
-    "@id": "http://schema.org/validThrough",
-    "name": "validThrough",
-    "title": "validThrough",
-    "description": "The date after when the item is not valid.",
-    "type": "DateTime",
-    "nullable": false
-  },
-      {
-        "@id": "http://schema.org/cardStatus",
-        "name": "cardStatus",
-        "title": "cardStatus",
-        "description": "Indicates the current disposition of the Card.",
-        "type": "ActionStatusType",
-        "value": "javascript:return { alternateName:'PotentialActionStatus' };"
-      },
-  {
-    "name": "dateCancelled",
-    "title": "Date Cancelled",
-    "description": "The date on which this item was cancelled.",
-    "type": "DateTime",
-    "nullable": true
-  },
-  {
-    "name": "cancelReason",
-    "title": "Λόγοι ακύρωσης",
-    "description": "Λόγοι ακύρωσης",
-    "type": "Text",
-    "size": 255,
-    "many": false,
-    "nullable": true
-  },
-  {
-    "name": "dateModified",
-    "title": "Ημερομηνία τροποποίησης",
-    "description": "Ημερομηνία τροποποίησης",
-    "type": "DateTime",
-    "nullable": false,
-    "value": "javascript:return new Date();",
-    "calculation": "javascript:return this.now();"
-  }
-  ],
-  "constraints": [
+    },
+    {
+      "name": "serialNumber",
+      "title": "Number",
+      "type": "Integer",
+      "nullable": false,
+      "value": "javascript:return this.newid();"
+    },
     {
-      "type": "unique",
-      "fields": [
-        "student",
-        "academicYear"
-      ]
+      "name": "dateCreated",
+      "title": "Date Created",
+      "description": "The date on which this item was created.",
+      "type": "DateTime",
+      "value": "javascript:return (new Date());",
+      "readonly": true
+    },
+    {
+      "@id": "http://schema.org/validFrom",
+      "name": "validFrom",
+      "title": "validFrom",
+      "description": "The date when the item becomes valid.",
+      "type": "DateTime",
+      "nullable": false
+    },
+    {
+      "@id": "http://schema.org/validThrough",
+      "name": "validThrough",
+      "title": "validThrough",
+      "description": "The date after when the item is not valid.",
+      "type": "DateTime",
+      "nullable": false
+    },
+    {
+      "@id": "http://schema.org/cardStatus",
+      "name": "cardStatus",
+      "title": "cardStatus",
+      "description": "Indicates the current disposition of the Card.",
+      "type": "ActionStatusType",
+      "value": "javascript:return { alternateName:'PotentialActionStatus' };"
+    },
+    {
+      "name": "dateCancelled",
+      "title": "Date Cancelled",
+      "description": "The date on which this item was cancelled.",
+      "type": "DateTime",
+      "nullable": true
+    },
+    {
+      "name": "cancelReason",
+      "title": "Λόγοι ακύρωσης",
+      "description": "Λόγοι ακύρωσης",
+      "type": "Text",
+      "size": 255,
+      "many": false,
+      "nullable": true
+    },
+    {
+      "name": "dateModified",
+      "title": "Ημερομηνία τροποποίησης",
+      "description": "Ημερομηνία τροποποίησης",
+      "type": "DateTime",
+      "nullable": false,
+      "value": "javascript:return new Date();",
+      "calculation": "javascript:return this.now();"
+    },
+    {
+      "name": "isActive",
+      "readonly": true,
+      "virtual": true
     }
   ],
   "privileges": [
@@ -143,7 +138,7 @@
       "type": "self",
       "account": "Students",
       "filter": "student/user eq me()"
-    }   
+    }
   ],
   "eventListeners": [
     {
@@ -159,5 +154,4 @@
       "type": "./listeners/SendEmailAfterCardStatusChangeListener"
     }
   ]
-}
-
+}

package/src/config/scope.access.js

@@ -259,6 +259,42 @@ export default [
             'write'
         ]
     },
+    {
+        'scope': [
+            'accommodation'
+        ],
+        'resource': '/api/RoomTypes',
+        'access': [
+            'read'
+        ]
+    },
+    {
+        'scope': [
+            'accommodation'
+        ],
+        'resource': '/api/Genders',
+        'access': [
+            'read'
+        ]
+    },
+    {
+        'scope': [
+            'accommodation'
+        ],
+        'resource': '/api/Regions',
+        'access': [
+            'read'
+        ]
+    },
+    {
+        'scope': [
+            'accommodation'
+        ],
+        'resource': '/api/Countries',
+        'access': [
+            'read'
+        ]
+    },
     {
         'scope': [
             'accommodation'
@@ -282,7 +318,7 @@ export default [
         'scope': [
             'students'
         ],
-        'resource': '/api/Accommodations/?$',
+        'resource': '/api/AccommodationPlaces/?$',
         'access': [
             'read'
         ]

package/src/listeners/StudentAccommodationCardSaveListener.js

@@ -13,18 +13,35 @@ export function beforeSave(event, callback) {
             /**
              * @type {Student|DataObject|*}
              */
-            const student = context.model('Student').convert(event.target.student);
-            // const isActive = await student.silent().isActive();
+            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.is(':active');
-            if (!isActive) {
+            
+            if (!isActive && event.state===1)
+            {
                 throw new DataError('ERR_STATUS',
                     'Invalid student status. Student Accommodation Card may be published upon an active student only.'+student
                     , null,
                     'Student', 'studentStatus');
             }
-            
-            const studentObject = await context.model('Student').where('id').equal(student.id).silent().flatten().getItem();
-            
+            if (Object.prototype.hasOwnProperty.call(event.target, 'CardStatus')) {
+                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 (!isActive && previousActionStatus !== targetActionStatus && targetActionStatus!=='CancelledActionStatus') {
+                    throw new DataError('ERR_STATUS',
+                        'The student accommodation card cannot be activated for an inactive student' + student
+                        , null,
+                        'Student', 'studentStatus');
+                }
+            }
+        
             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');

package/src/models/StudentAccommodationCard.js

@@ -1,6 +1,7 @@
 
-import { DataObject, EdmMapping } from '@themost/data';
-import { DataError, DataNotFoundError } from "@themost/common"
+import { EdmMapping } from '@themost/data';
+import { DataError, DataNotFoundError, Args, TraceUtils, LangUtils } from "@themost/common"
+import EnableAttachmentModel from './EnableAttachmentModel';
 
 /**
  * @class
@@ -20,7 +21,7 @@ import { DataError, DataNotFoundError } from "@themost/common"
  * @property {User|any} student 
  */
 @EdmMapping.entityType('StudentAccommodationCard')
-class StudentAccommodationCard extends DataObject {
+class StudentAccommodationCard extends EnableAttachmentModel {
     /**
  * @constructor
  */
@@ -35,58 +36,180 @@ class StudentAccommodationCard extends DataObject {
 
     async cancel(data) {
 
-        if (!data.cancelReason) {
-            throw new DataError('E_CANCEL_REASON', 'Cancel Reason should be provided');
-        }
+        Args.notEmpty(data.cancelReason, 'Cancel Reason');
 
+        if ( !LangUtils.isDate(data.dateCancelled) ) {
+            throw new DataError('E_STATE', 'Cancel date can not be empty or invalid date');
+        }
         await this.context.executeInTransactionAsync(async () => {
             // find StudentAccommodationCard from id
-            const StudentAccommodationCard = await this.context.model('StudentAccommodationCard')
+            const currentStudentAccommodationCard = await this.context.model('StudentAccommodationCard')
                 .where('id')
                 .equal(this.getId())
-                .select('id', 'active', 'action', 'student', 'academicPeriod', 'academicYear')
-                .flatten()
+                .select('id', 'serialNumber', 'action', 'student', 'cardStatus', 'academicYear', 'isActive', 'validThrough', 'accommodationRoom')
+                .expand('cardStatus')
                 .getItem();
 
-            // validate existance and permission
-            if (StudentAccommodationCard == null) {
-                throw new DataNotFoundError('The specified Student Accommodation Card cannot be found or is inaccessible');
-            }
+            Args.notNull(currentStudentAccommodationCard, 'The specified Student Accommodation Card' )
             // StudentAccommodationCard already cancelled throw error
-            if (StudentAccommodationCard.active === false) {
-                throw new DataError('E_ACTIVE', 'The specified Student Accommodation Card is already cancelled')
+            if ( currentStudentAccommodationCard?.cardStatus?.alternateName === 'CompletedActionStatus') {
+                throw new DataError('E_ACTIVE', 'The specified Student Accommodation Card in not active')
             }
+            // cancel StudentAccommodationCard
+            currentStudentAccommodationCard.cardStatus = { alternateName: 'CompletedActionStatus' };
+            currentStudentAccommodationCard.cancelReason = data.cancelReason;
+            currentStudentAccommodationCard.dateCancelled = data.dateCancelled;
+            await this.context.model('StudentAccommodationCard').save(currentStudentAccommodationCard);
+            const room = currentStudentAccommodationCard.accommodationRoom?.id || currentStudentAccommodationCard?.accommodationRoom;
+            Args.notNull(room, 'Accommodation room can not be empty');
+            Args.notNumber(room, 'Accommodation room should be a number');
+            await calculateOccupancy(this.context, room);
+        },(err)=>{
+            TraceUtils.log(err);
+        });
+    }
 
-            //validate AccommodationRequestAction
-            if (StudentAccommodationCard.action == null) {
-                throw new DataError('E_ACTION', 'The Student Accommodation Card is not linked to a Accommodation Request Action')
-            }
+    @EdmMapping.param('data', 'Object', false, true)
+    @EdmMapping.action('changeRoom', 'StudentAccommodationCard')
 
-            // cancel StudentAccommodationCard
-            StudentAccommodationCard.cardStatus = {alternateName: "CancelledActionStatus"};
-            StudentAccommodationCard.cancelReason = data.cancelReason;
-            await this.context.model('StudentAccommodationCard').save(StudentAccommodationCard);
-
-            const action = await this.context.model('AccommodationRequestAction').where('id').equal(StudentAccommodationCard.action).select('id', 'actionStatus/alternateName as requestStatus').getItem();
-            //validate AccommodationRequestAction
-            if (action == null) {
-                throw new DataError('E_ACTION', 'The specified AccommodationRequestAction cannot be found or is inaccessible')
+    async changeRoom(data) {
+
+        const room = data.accommodationRoom?.id || data?.accommodationRoom;
+        Args.notNull(room, 'Accommodation room can not be empty');
+        Args.notNumber(room, 'Accommodation room should be a number');
+
+        if ( !LangUtils.isDate(data.validThrough) ) {
+            throw new DataError('E_STATE', 'Valid through date can not be empty or it is not a valid date');
+        }
+        
+        Args.notEmpty(data.cancelReason, 'Cancel Reason cannot be empty');
+
+        if ( !LangUtils.isDate(data.dateCancelled) ) {
+            throw new DataError('E_STATE', 'Cancel date can not be empty or invalid date');
+        }
+
+        await this.context.executeInTransactionAsync(async () => {
+            const currentStudentAccommodationCard = await this.context.model('StudentAccommodationCard')
+                .where('id')
+                .equal(this.getId())
+                .select('id', 'serialNumber', 'action', 'student', 'cardStatus', 'academicYear', 'isActive', 'validThrough', 'accommodationRoom')
+                .expand('cardStatus')
+                .getItem();
+
+            Args.notNull(currentStudentAccommodationCard, 'The specified Student Accommodation Card cannot be found or is inaccessible');
+
+            if (currentStudentAccommodationCard?.cardStatus?.alternateName !== 'ActiveActionStatus') {
+                throw new DataError('E_STATE', 'The accommodation room cannot be changed for inactive accommodation card');
             }
+            const newCard = {
+                action: currentStudentAccommodationCard.action,
+                student: currentStudentAccommodationCard.student,
+                accommodationRoom: room,
+                academicYear: currentStudentAccommodationCard.academicYear,
+                validFrom: data.validThrough,
+                validThrough: currentStudentAccommodationCard.validThrough,
+                cardStatus: {
+                    alternateName: 'ActiveActionStatus'
+                }
+            }
+
+            currentStudentAccommodationCard.cancelReason = data.cancelReason;
+            currentStudentAccommodationCard.dateCancelled = data.dateCancelled;
+            currentStudentAccommodationCard.validThrough = data.dateCancelled;
+            delete currentStudentAccommodationCard.cardStatus ;
+            currentStudentAccommodationCard.cardStatus= { alternateName : 'CompletedActionStatus'};
 
-            if (action.requestStatus !== 'CompletedActionStatus') {
-                throw new DataError('E_ACTION', 'The specified AccommodationRequestAction is not in Completed state')
+            await this.context.model('StudentAccommodationCard').save(currentStudentAccommodationCard);
+            const currentAccommodationRoom = currentStudentAccommodationCard.accommodationRoom?.id || currentStudentAccommodationCard?.accommodationRoom;
+            Args.notNull(currentAccommodationRoom, 'The specified Student Accommodation Card does not contain any room');
+            await calculateOccupancy(this.context, currentAccommodationRoom);
+            await this.context.model('StudentAccommodationCards').save(newCard);
+            await calculateOccupancy(this.context, room);
+        },(err)=>{
+            TraceUtils.log(err);
+        });
+    }
+
+    @EdmMapping.param('data', 'Object', false, true)
+    @EdmMapping.action('addToRoom', 'StudentAccommodationCard')
+
+    async addToRoom(data) {
+        const room = data.accommodationRoom?.id || data?.accommodationRoom;
+        Args.notNull(room, 'Accommodation room can not be empty');
+        Args.notNumber(room, 'Accommodation room should be a number');
+        if (!LangUtils.isDate(data.validFrom)) {
+            throw new DataError('E_STATE', 'Valid through date can not be empty or it is not a valid date');
+        }
+        await this.context.executeInTransactionAsync(async () => {
+            const currentStudentAccommodationCard = await this.context.model('StudentAccommodationCard')
+                .where('id')
+                .equal(this.getId())
+                .select('id', 'serialNumber', 'action', 'student', 'cardStatus', 'academicYear', 'isActive', 'validThrough')
+                .expand('cardStatus')
+                .getItem();
+            Args.notNull(currentStudentAccommodationCard, 'The specified Student Accommodation Card cannot be found or is inaccessible');
+            if (currentStudentAccommodationCard?.cardStatus?.alternateName !== 'ActiveActionStatus') {
+                throw new DataError('E_STATE', 'Add to room action can only be applied when student accommodation card status is Active');
             }
+            currentStudentAccommodationCard.accommodationRoom = room;
+            currentStudentAccommodationCard.validFrom = data.validFrom;
+            await this.context.model('StudentAccommodationCard').save(currentStudentAccommodationCard);
+            await calculateOccupancy(this.context, room); // calculate occupancy after new room updated 
+        }, (err) => {
+            TraceUtils.log(err);
+        });
+    }
 
-            action.actionStatus = {
-                alternateName: "ActiveActionStatus"
+    @EdmMapping.param('data', 'Object', false, true)
+    @EdmMapping.action('revertToPending', 'StudentAccommodationCard')
+
+    async revertToPending(data) {
+        await this.context.executeInTransactionAsync(async () => {
+            const currentStudentAccommodationCard = await this.context.model('StudentAccommodationCard')
+                .where('id')
+                .equal(this.getId())
+                .select('id', 'serialNumber', 'action', 'student', 'cardStatus', 'academicYear', 'isActive', 'validThrough', 'accommodationRoom')
+                .expand('cardStatus')
+                .getItem();
+
+            Args.notNull(currentStudentAccommodationCard, 'The specified Student Accommodation Card cannot be found or is inaccessible');
+            if (currentStudentAccommodationCard?.cardStatus?.alternateName !== 'ActiveActionStatus') {
+                throw new DataError('E_STATE', 'Inactive accommodation card');
             }
 
-            delete action.requestStatus;
-            await this.context.model('AccommodationRequestAction').save(action);
+            const accommodationRoom = currentStudentAccommodationCard.accommodationRoom?.id || currentStudentAccommodationCard?.accommodationRoom;
+            currentStudentAccommodationCard.cardStatus = { alternateName: 'ActiveActionStatus' };
+            currentStudentAccommodationCard.accommodationRoom = null;
+            await this.context.model('StudentAccommodationCard').save(currentStudentAccommodationCard);
+            await calculateOccupancy(this.context, accommodationRoom);
         });
     }
 
 
 }
+async function calculateOccupancy(context, accommodationRoom) {
+    if (accommodationRoom == null) {
+        return;
+    }
+    const currentOccupancy = await context.model('StudentAccommodationCard')
+        .where('accommodationRoom').equal(accommodationRoom)
+        .and('cardStatus/alternateName').equal('ActiveActionStatus')
+        .and('accommodationRoom/outOfService').equal(0)
+        .and('accommodationRoom/roomType/accessibleType').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
+    });
+}
 
 module.exports = StudentAccommodationCard;