@universis/accommodation 1.1.1 → 1.1.3

package/dist/listeners/OnUpdateAccommodationRoomListener.js

@@ -0,0 +1,151 @@
+"use strict";Object.defineProperty(exports, "__esModule", { value: true });exports.afterSave = afterSave;exports.beforeSave = beforeSave;
+var _common = require("@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 _common.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) {var _target$accommodation;
+    const targetAccommodationRoom = ((_target$accommodation = target.accommodationRoom) === null || _target$accommodation === void 0 ? void 0 : _target$accommodation.id) || target.accommodationRoom;
+
+    if (previous.accommodationRoom !== targetAccommodationRoom && targetAccommodationRoom != null && previous.accommodationRoom != null) {
+
+      if (targetActionStatus !== 'CompletedActionStatus') {
+        throw new _common.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) {var _target$accommodation2;
+
+  if (event.state !== 2) {
+    return;
+  }
+
+  const previous = event.previous;
+  if (previous == null) {
+    throw new _common.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$accommodation2 = target.accommodationRoom) === null || _target$accommodation2 === void 0 ? void 0 : _target$accommodation2.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 _common.DataError('E_STATE', 'No room space for new resident');
+  }
+
+  await context.model('AccommodationRoom').save({
+    id: accommodationRoom,
+    currentOccupancy: totalOccupancy
+  });
+}
+
+/**
+ * @param {DataEventArgs} event
+ * @param {Function} callback
+ */
+function beforeSave(event, callback) {
+  return beforeSaveAsync(event).then(() => {
+    return callback();
+  }).catch((err) => {
+    return callback(err);
+  });
+}
+
+/**
+ * @param {DataEventArgs} event
+ * @param {Function} callback
+ */
+function afterSave(event, callback) {
+  return afterSaveAsync(event).then(() => {
+    return callback();
+  }).catch((err) => {
+    return callback(err);
+  });
+}
+//# sourceMappingURL=OnUpdateAccommodationRoomListener.js.map

package/dist/listeners/OnUpdateAccommodationRoomListener.js.map

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

package/dist/listeners/StudentAccommodationCardSaveListener.js

@@ -13,7 +13,15 @@ var _common = require("@themost/common"); /**
       /**
        * @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 _common.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 @@ var _common = require("@themost/common"); /**
         '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 _common.DataError('E_VALUE', 'Invalid academic year. Expected number.', null, 'AcademicYear', 'id');

package/dist/listeners/StudentAccommodationCardSaveListener.js.map

@@ -1 +1 @@
-{"version":3,"file":"StudentAccommodationCardSaveListener.js","names":["_common","require","beforeSave","event","callback","state","context","model","student","convert","target","isActive","is","DataError","studentObject","where","equal","id","silent","flatten","getItem","academicYear","getId","Number","isInteger","academicYearObject","undefined","academicPeriod","academicPeriodObject","then","catch","err","afterSave","accommodationRoom","Object","keys","length","room","newRoom","currentOccupancy","save"],"sources":["../../src/listeners/StudentAccommodationCardSaveListener.js"],"sourcesContent":["/**\n * @param {DataEventArgs} event\n * @param {Function} callback\n */\nimport {DataError} from \"@themost/common\";\n\nexport function beforeSave(event, callback) {\n    (async () => {\n\n        // validate student state (on insert or update)\n        if (event.state === 1 || event.state === 2) {\n            let context = event.model.context;\n            /**\n             * @type {Student|DataObject|*}\n             */\n            const student = context.model('Student').convert(event.target.student);\n            // const isActive = await student.silent().isActive();\n            const isActive = await student.is(':active');\n            if (!isActive) {\n                throw new DataError('ERR_STATUS',\n                    'Invalid student status. Student Accommodation Card may be published upon an active student only.'+student\n                    , null,\n                    'Student', 'studentStatus');\n            }\n            \n            const studentObject = await context.model('Student').where('id').equal(student.id).silent().flatten().getItem();\n            \n            const academicYear = context.model('AcademicYear').convert(event.target.academicYear).getId();\n            if (Number.isInteger(academicYear) === false) {\n                throw new DataError('E_VALUE', 'Invalid academic year. Expected number.', null, 'AcademicYear', 'id');\n            }\n\n            const academicYearObject =  await context.model('AcademicYear').where('id').equal(academicYear).getItem();\n            if (academicYearObject === undefined){\n                throw new DataError('E_VALUE', 'Invalid academic year.', null, 'AcademicYear', 'id');\n            }\n\n            if (event.target.academicPeriod != null){\n\n                const academicPeriod = context.model('AcademicPeriod').convert(event.target.academicPeriod).getId();\n                if (Number.isInteger(academicPeriod) === false) {\n                    throw new DataError('E_VALUE', 'Invalid academic period. Expected number.', null, 'AcademicPeriod', 'id');\n                }\n    \n                const academicPeriodObject =  await context.model('AcademicPeriod').where('id').equal(academicPeriod).getItem();\n                if (academicPeriodObject === undefined){\n                    throw new DataError('E_VALUE', 'Invalid academic period.', null, 'AcademicPeriod', 'id');\n                }\n                \n            }\n        }\n    })().then( () => {\n       return callback();\n    }).catch( err => {\n        return callback(err);\n    });\n}\n\n\n/**\n * @param {DataEventArgs} event\n * @param {Function} callback\n */\nexport function afterSave(event, callback) {\n    (async () => {\n        //\n        let context = event.model.context;\n        if (event.state === 1) {\n            if (event.target.accommodationRoom && Object.keys(event.target.accommodationRoom).length != 0) {\n                // get accommodation valid through date\n\n                const room = await context.model('AccommodationRoom').where('id').equal(event.target.accommodationRoom.id).getItem();\n                if (room === undefined) {\n                    throw new DataError('E_VALUE', 'Invalid accommodation room.', null, 'AccommodationRoom', 'id');\n                }\n                let newRoom = room;\n                newRoom.currentOccupancy = room.currentOccupancy+1;\n                //todo if i can increase occupancy\n                await context.model('AccommodationRoom').silent().save(newRoom);\n            }\n        }\n\n\n    })().then(() => {\n        return callback();\n    }).catch(err => {\n        return callback(err);\n    });\n}\n"],"mappings":"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"}
+{"version":3,"file":"StudentAccommodationCardSaveListener.js","names":["_common","require","beforeSave","event","callback","state","context","model","previous","student","convert","target","DataError","isActive","is","academicYear","getId","Number","isInteger","academicYearObject","where","equal","getItem","undefined","academicPeriod","academicPeriodObject","then","catch","err","afterSave","accommodationRoom","Object","keys","length","room","id","newRoom","currentOccupancy","silent","save"],"sources":["../../src/listeners/StudentAccommodationCardSaveListener.js"],"sourcesContent":["/**\n * @param {DataEventArgs} event\n * @param {Function} callback\n */\nimport {DataError} from \"@themost/common\";\n\nexport function beforeSave(event, callback) {\n    (async () => {\n\n        // validate student state (on insert or update)\n        if (event.state === 1 || event.state === 2) {\n            let context = event.model.context;\n            /**\n             * @type {Student|DataObject|*}\n             */\n            const previous = event.previous;\n            let student = context.model('Student').convert(event.target.student);\n            if (!student){\n                if (previous){\n                    student = context.model('Student').convert(previous.student);\n                }else{\n                    throw new DataError('ERR_STATUS','Student cannot be found');\n                }\n            }\n            // const isActive = await student.silent().isActive();\n            const isActive = await student.is(':active');\n            if (!isActive) {\n                throw new DataError('ERR_STATUS',\n                    'Invalid student status. Student Accommodation Card may be published upon an active student only.'+student\n                    , null,\n                    'Student', 'studentStatus');\n            }\n            \n            const academicYear = context.model('AcademicYear').convert(event.target.academicYear).getId();\n            if (Number.isInteger(academicYear) === false) {\n                throw new DataError('E_VALUE', 'Invalid academic year. Expected number.', null, 'AcademicYear', 'id');\n            }\n\n            const academicYearObject =  await context.model('AcademicYear').where('id').equal(academicYear).getItem();\n            if (academicYearObject === undefined){\n                throw new DataError('E_VALUE', 'Invalid academic year.', null, 'AcademicYear', 'id');\n            }\n\n            if (event.target.academicPeriod != null){\n\n                const academicPeriod = context.model('AcademicPeriod').convert(event.target.academicPeriod).getId();\n                if (Number.isInteger(academicPeriod) === false) {\n                    throw new DataError('E_VALUE', 'Invalid academic period. Expected number.', null, 'AcademicPeriod', 'id');\n                }\n    \n                const academicPeriodObject =  await context.model('AcademicPeriod').where('id').equal(academicPeriod).getItem();\n                if (academicPeriodObject === undefined){\n                    throw new DataError('E_VALUE', 'Invalid academic period.', null, 'AcademicPeriod', 'id');\n                }\n                \n            }\n        }\n    })().then( () => {\n       return callback();\n    }).catch( err => {\n        return callback(err);\n    });\n}\n\n\n/**\n * @param {DataEventArgs} event\n * @param {Function} callback\n */\nexport function afterSave(event, callback) {\n    (async () => {\n        //\n        let context = event.model.context;\n        if (event.state === 1) {\n            if (event.target.accommodationRoom && Object.keys(event.target.accommodationRoom).length != 0) {\n                // get accommodation valid through date\n\n                const room = await context.model('AccommodationRoom').where('id').equal(event.target.accommodationRoom.id).getItem();\n                if (room === undefined) {\n                    throw new DataError('E_VALUE', 'Invalid accommodation room.', null, 'AccommodationRoom', 'id');\n                }\n                let newRoom = room;\n                newRoom.currentOccupancy = room.currentOccupancy+1;\n                //todo if i can increase occupancy\n                await context.model('AccommodationRoom').silent().save(newRoom);\n            }\n        }\n\n\n    })().then(() => {\n        return callback();\n    }).catch(err => {\n        return callback(err);\n    });\n}\n"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@universis/accommodation",
-  "version": "1.1.1",
+  "version": "1.1.3",
   "description": "Universis api library template",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/config/models/AccommodationChildFinancialAttribute.json

@@ -25,6 +25,11 @@
           "type": "global",
           "account": "Administrators"
         },
+        {
+          "mask": 15,
+          "type": "global",
+          "account": "AccommodationAdministrators"
+        },
         {
             "mask": 1,
             "type": "self",

package/src/config/models/AccommodationGuardianFinancialAttribute.json

@@ -25,6 +25,11 @@
           "type": "global",
           "account": "Administrators"
         },
+        {
+          "mask": 15,
+          "type": "global",
+          "account": "AccommodationAdministrators"
+        },
         {
             "mask": 1,
             "type": "self",

package/src/config/models/AccommodationPlace.json

@@ -8,7 +8,7 @@
   "sealed": false,
   "implements": "Place",
   "classPath": "./models/AccommodationPlace",
-  "version": "1.0",
+  "version": "1.1",
   "fields": [
     {
       "@id": "http://schema.org/identifier",
@@ -25,13 +25,6 @@
       "type": "Boolean",
       "default": true
     },
-    {
-      "name": "numberOfRooms",
-      "description": "The number of rooms (excluding bathrooms and closets) of the accommodation.",
-      "type": "Number",
-      "nullable": false,
-      "editable": true
-    },
     {
       "@id": "http://schema.org/events",
       "name": "events",
@@ -56,6 +49,8 @@
       "name": "address",
       "title": "address",
       "description": "Physical address of the item.",
+      "nested": true,
+      "many": true,
       "type": "PostalAddress",
       "mapping": {
           "parentModel": "AccommodationPlace",
@@ -73,20 +68,20 @@
       "description": "The geo coordinates of the accommodation.",
       "type": "Json",
       "additionalType": "GeoCoordinates"
-  },
-  {
+    },
+    {
       "name": "locales",
       "type": "AccommodationPlaceLocale",
       "mapping": {
-          "associationType": "association",
-          "cascade": "delete",
-          "parentModel": "AccommodationPlace",
-          "parentField": "id",
-          "childModel": "AccommodationPlaceLocale",
-          "childField": "object"
+        "associationType": "association",
+        "cascade": "delete",
+        "parentModel": "AccommodationPlace",
+        "parentField": "id",
+        "childModel": "AccommodationPlaceLocale",
+        "childField": "object"
       }
-  },
-  {
+    },
+    {
       "name": "locale",
       "type": "AccommodationPlaceLocale",
       "readonly": true,
@@ -95,35 +90,47 @@
       "expandable": true,
       "multiplicity": "ZeroOrOne",
       "mapping": {
-          "associationType": "association",
-          "cascade": "delete",
-          "parentModel": "AccommodationPlace",
-          "parentField": "id",
-          "childModel": "AccommodationPlaceLocale",
-          "childField": "object",
-          "options": {
-              "$filter": "inLanguage eq lang()",
-              "$first": true
-          }
+        "associationType": "association",
+        "cascade": "delete",
+        "parentModel": "AccommodationPlace",
+        "parentField": "id",
+        "childModel": "AccommodationPlaceLocale",
+        "childField": "object",
+        "options": {
+          "$filter": "inLanguage eq lang()",
+          "$first": true
+        }
       }
-  }
+    },
+    {
+      "name": "rooms",
+      "type": "AccommodationRoom",
+      "mapping": {
+        "associationType": "association",
+        "cascade": "delete",
+        "parentModel": "AccommodationPlace",
+        "parentField": "id",
+        "childModel": "AccommodationRoom",
+        "childField": "containedInPlace"
+      }
+    }
   ],
   "eventListeners": [
     {
-        "type": "@themost/data/previous-state-listener"
+      "type": "@themost/data/previous-state-listener"
     },
     {
-        "type": "./listeners/data-localization"
+      "type": "./listeners/data-localization"
     }
   ],
   "constraints": [
-        {
-            "type": "unique",
-            "fields": [
-                "identifier"
-            ]
-        }
-    ],
+    {
+      "type": "unique",
+      "fields": [
+        "identifier"
+      ]
+    }
+  ],
   "privileges": [
     {
       "mask": 1,
@@ -138,6 +145,11 @@
       "mask": 15,
       "type": "global",
       "account": "Administrators"
+    },
+    {
+      "mask": 15,
+      "type": "global",
+      "account": "AccommodationAdministrators"
     }
   ]
 }

package/src/config/models/AccommodationPlaceLocale.json

@@ -81,6 +81,11 @@
         "mask": 15,
         "type": "global",
         "account": "Administrators"
+      },
+      {
+        "mask": 15,
+        "type": "global",
+        "account": "AccommodationAdministrators"
       }
     ]
   }

package/src/config/models/AccommodationRequestAction.json

@@ -401,6 +401,11 @@
                 "mask": 15,
                 "type": "global",
                 "account": "Administrators"
+              },
+              {
+                "mask": 15,
+                "type": "global",
+                "account": "AccommodationAdministrators"
               }
             ]
         }
@@ -443,6 +448,11 @@
         "type": "global",
         "account": "Administrators"
       },
+      {
+        "mask": 15,
+        "type": "global",
+        "account": "AccommodationAdministrators"
+      },
       {
         "mask": 1,
         "type": "self",

package/src/config/models/AccommodationRequestActionMessage.json

@@ -30,6 +30,11 @@
       "type": "global",
       "account": "Administrators"
     },
+    {
+      "mask": 15,
+      "type": "global",
+      "account": "AccommodationAdministrators"
+    },
     {
       "mask": 1,
       "type": "self",

package/src/config/models/AccommodationRequestActionReview.json

@@ -26,6 +26,11 @@
       "mask": 15,
       "type": "global",
       "account": "Administrators"
+    },
+    {
+      "mask": 15,
+      "type": "global",
+      "account": "AccommodationAdministrators"
     }
   ]
 }

package/src/config/models/AccommodationRequestAttachmentConfiguration.json

@@ -67,6 +67,11 @@
             "mask": 15,
             "type": "global",
             "account": "Administrators"
+        },
+        {
+            "mask": 15,
+            "type": "global",
+            "account": "AccommodationAdministrators"
         }
     ]
 }

package/src/config/models/AccommodationRequestCategory.json

@@ -23,20 +23,25 @@
         }
     ],
     "privileges": [
-        {
-            "mask": 1,
-            "type": "global",
-            "account": "*"
-        },
-        {
-            "mask": 15,
-            "type": "global"
-        },
-        {
-            "mask": 15,
-            "type": "global",
-            "account": "Administrators"
-        }
+      {
+        "mask": 1,
+        "type": "global",
+        "account": "*"
+      },
+      {
+        "mask": 15,
+        "type": "global"
+      },
+      {
+        "mask": 15,
+        "type": "global",
+        "account": "Administrators"
+      },
+      {
+        "mask": 15,
+        "type": "global",
+        "account": "AccommodationAdministrators"
+      }
     ],
     "constraints": [
         {

package/src/config/models/AccommodationRequestEvent.json

@@ -99,19 +99,24 @@
         }
     ],
     "privileges": [
-        {
-            "mask": 15,
-            "type": "global"
-        },
-        {
-            "mask": 1,
-            "type": "global",
-            "account": "*"
-        },
-        {
-            "mask": 15,
-            "type": "global",
-            "account": "Administrators"
-        }
+      {
+        "mask": 15,
+        "type": "global"
+      },
+      {
+        "mask": 1,
+        "type": "global",
+        "account": "*"
+      },
+      {
+        "mask": 15,
+        "type": "global",
+        "account": "Administrators"
+      },
+      {
+        "mask": 15,
+        "type": "global",
+        "account": "AccommodationAdministrators"
+      }
     ]
 }

package/src/config/models/AccommodationRequestFinancialAttribute.json

@@ -48,6 +48,11 @@
           "mask": 15,
           "type": "global",
           "account": "Administrators"
+        },
+        {
+            "mask": 15,
+            "type": "global",
+            "account": "AccommodationAdministrators"
         }
       ]
 }

package/src/config/models/AccommodationRoom.json

@@ -24,7 +24,7 @@
         "type": "Text",
         "size": 500
       },
-            {
+      {
         "name": "roomType",
         "description": "Tύπος δωματίου",
         "type": "RoomType",
@@ -161,7 +161,19 @@
                   "$first": true
               }
           }
+      }, 
+     {
+      "name": "cards",
+      "type": "StudentAccommodationCard",
+      "mapping": {
+        "associationType": "association",
+        "cascade": "delete",
+        "parentModel": "AccommodationRoom",
+        "parentField": "id",
+        "childModel": "StudentAccommodationCard",
+        "childField": "accommodationRoom"
       }
+    }
   ],
   "eventListeners": [
     {
@@ -185,6 +197,11 @@
           "mask": 15,
           "type": "global",
           "account": "Administrators"
+      },
+      {
+          "mask": 15,
+          "type": "global",
+          "account": "AccommodationAdministrators"
       }
   ]
 }

package/src/config/models/AccommodationRoomLocale.json

@@ -81,6 +81,11 @@
         "mask": 15,
         "type": "global",
         "account": "Administrators"
+      },
+      {
+        "mask": 15,
+        "type": "global",
+        "account": "AccommodationAdministrators"
       }
     ]
   }