@universis/accommodation 1.1.0 → 1.1.2

package/src/config/scope.access.js

@@ -1,148 +1,327 @@
 export default [
     {
-        "scope": [
-            "registrar"
+        'scope': [
+            'accommodation'
         ],
-        "resource": "/api/TestActions/?$",
-        "access": [
-            "read",
-            "write"
+        'resource': '/api/users/me',
+        'access': [
+            'read'
         ]
     },
     {
-        "scope": [
-            "registrar"
+        'scope': [
+            'accommodation'
         ],
-        "resource": "/api/Accommodations/?$",
-        "access": [
-            "read",
-            "write"
+        'resource': '/api/content/private',
+        'access': [
+            'read'
         ]
     },
     {
-        "scope": [
-            "registrar"
+        'scope': [
+            'accommodation'
         ],
-        "resource": "/api/AccommodationPlaces/?$",
-        "access": [
-            "read",
-            "write"
+        'resource': '/api/ActionStatusTypes',
+        'access': [
+            'read'
         ]
     },
     {
-        "scope": [
-            "students"
+        'scope': [
+            'accommodation'
         ],
-        "resource": "/api/TestActions/?$",
-        "access": [
-            "read",
-            "write"
+        'resource': '/api/StudentStatuses',
+        'access': [
+            'read'
         ]
     },
     {
-        "scope": [
-            "students"
+        'scope': [
+            'accommodation'
         ],
-        "resource": "/api/Accommodations/?$",
-        "access": [
-            "read"
+        'resource': '/api/StudentCategories',
+        'access': [
+            'read'
         ]
     },
     {
-        "scope": [
-            "students"
+        'scope': [
+            'accommodation'
         ],
-        "resource": "/api/AccommodationRequestActions",
-        "access": [
-            "read",
-            "write"
+        'resource': '/api/FamilyStatuses',
+        'access': [
+            'read'
         ]
     },
     {
-        "scope": [
-            "students"
+        'scope': [
+            'accommodation'
         ],
-        "resource": "/api/AccommodationRequestEvents",
-        "access": [
-            "read"
+        'resource': '/api/LocalDepartments',
+        'access': [
+            'read'
         ]
     },
     {
-        "scope": [
-            "students"
+        'scope': [
+            'accommodation'
         ],
-        "resource": "/api/AccommodationRequestCategories",
-        "access": [
-            "read"
+        'resource': '/api/EventStatusTypes',
+        'access': [
+            'read'
         ]
     },
     {
-        "scope": [
-            "students"
+        'scope': [
+            'accommodation'
         ],
-        "resource": "/api/StudentAccommodationCards",
-        "access": [
-            "read"
+        'resource': '/api/JsonAttachments',
+        'access': [
+            'read'
         ]
     },
     {
-        "scope": [
-            "registrar"
+        'scope': [
+            'registrar',
+            'accommodation'
         ],
-        "resource": "/api/AccommodationRequestActions",
-        "access": [
-            "read",
-            "write"
+        'resource': '/api/AccommodationInscriptionModeTags',
+        'access': [
+            'read',
+            'write'
         ]
     },
     {
-        "scope": [
-            "registrar"
+        'scope': [
+            'accommodation'
         ],
-        "resource": "/api/AccommodationRequestEvents",
-        "access": [
-            "read",
-            "write"
+        'resource': '/api/AccommodationRequestActions',
+        'access': [
+            'read',
+            'write'
         ]
     },
     {
-        "scope": [
-            "registrar"
+        'scope': [
+            'accommodation'
         ],
-        "resource": "/api/AccommodationRequestEffectiveStatusTypes",
-        "access": [
-            "read",
-            "write"
+        'resource': '/api/SpecialAccommodationRequestActions',
+        'access': [
+            'read',
+            'write'
         ]
     },
     {
-        "scope": [
-            "registrar"
+        'scope': [
+            'accommodation'
         ],
-        "resource": "/api/AccommodationCardEffectiveStatusTypes",
-        "access": [
-            "read",
-            "write"
+        'resource': '/api/AccommodationRequestActionMessages',
+        'access': [
+            'read',
+            'write'
         ]
     },
     {
-        "scope": [
-            "registrar"
+        'scope': [
+            'accommodation'
         ],
-        "resource": "/api/AccommodationRequestCategories",
-        "access": [
-            "read",
-            "write"
+        'resource': '/api/AccommodationRequestActionReviews',
+        'access': [
+            'read',
+            'write'
         ]
     },
     {
-        "scope": [
-            "registrar"
+        'scope': [
+            'accommodation'
         ],
-        "resource": "/api/StudentAccommodationCards/?$",
-        "access": [
-            "read",
-            "write"
+        '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/Institutes',
+        'access': [
+            'read'
+        ]
+    },
+    {
+        'scope': [
+            'students'
+        ],
+        'resource': '/api/TestActions/?$',
+        'access': [
+            'read',
+            'write'
+        ]
+    },
+    {
+        'scope': [
+            'students'
+        ],
+        'resource': '/api/Accommodations/?$',
+        '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/OnActionCompleteListener.js

@@ -47,9 +47,9 @@ async function afterSaveAsync(event) {
             academicPeriod = student && student.department && student.department.currentPeriod ? student.department.currentPeriod : null;
         }
         let cardActionStatus = {};
-        if (event.target.accommodation && (Object.keys(event.target.accommodation).length === 0 || event.target.accommodation === '')) {
+        if (!event.target.accommodation ){
             // get accommodation valid through date
-            cardActionStatus = { alternateName: 'PotentialActionStatus' }
+            cardActionStatus = { alternateName: 'ActiveActionStatus' }
 
         } else {
             cardActionStatus = { alternateName: 'CompletedActionStatus' }

package/src/listeners/SendEmailAfterCardStatusChangeListener.js

@@ -13,16 +13,16 @@ async function afterSaveAsync(event) {
         const mailer = getMailer(context);
 
         const currentCardStatus = await context
-            .model('StudentDiningCard')
+            .model('StudentAccommodationCard')
             .where('id')
             .equal(event.target.id)
-            .select('active')
+            .select('cardStatus')
             .value();
         let previousCardStatus = 'UnknownStatus';
         if (event.previous) {
-            previousCardStatus = event.previous.active;
+            previousCardStatus = event.previous.cardStatus;
         } else {
-            throw new DataError('E_STATE', 'The previous state of an object cannot be determined', null, 'StudentDiningCard');
+            throw new DataError('E_STATE', 'The previous state of an object cannot be determined', null, 'StudentAccommodationCard');
         }
         if (currentCardStatus === previousCardStatus) {
             return;
@@ -32,7 +32,7 @@ async function afterSaveAsync(event) {
         const mailTemplate = await context
             .model('MailConfigurations')
             .where('target')
-            .equal('DiningCardActiveStatusChange')
+            .equal('AccommodationCardActiveStatusChange')
             .silent()
             .getItem();
         if (mailTemplate == null) {
@@ -44,7 +44,7 @@ async function afterSaveAsync(event) {
         let item;
         if (typeof event.target.action === 'object' && typeof event.target.action.id === 'number' && Number.isInteger(event.target.action.id) && event.target.action.id > 0) {
             item = await context
-                .model('DiningRequestAction')
+                .model('AccommodationRequestAction')
                 .where('id')
                 .equal(event.target.action.id)
                 .expand({
@@ -58,7 +58,7 @@ async function afterSaveAsync(event) {
 
         } else if (typeof event.target.action === 'number' && Number.isInteger(event.target.action) && event.target.action > 0) {
             item = await context
-                .model('DiningRequestAction')
+                .model('AccommodationRequestAction')
                 .where('id')
                 .equal(event.target.action)
                 .expand({
@@ -83,7 +83,7 @@ async function afterSaveAsync(event) {
         const config = await context
             .model('StudentRequestConfiguration')
             .where('additionalType')
-            .equal('DiningRequestAction')
+            .equal('AccommodationRequestAction')
             .and('inLanguage')
             .equal(event.target.inLanguage || context.locale)
             .silent()

package/dist/models/Accommodation.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"Accommodation.js","names":["_common","require","_data","_dec","_dec2","_dec3","_class","_class2","_applyDecoratedDescriptor","target","property","decorators","descriptor","context","desc","Object","keys","forEach","key","enumerable","configurable","initializer","writable","slice","reverse","reduce","decorator","value","call","undefined","defineProperty","AccommodationRequestEvent","EdmMapping","entityType","param","action","DataObject","constructor","remove","data","model","getModel","item","where","equal","getId","getItem","translateService","application","getStrategy","TranslateService","DataError","translate","hasRooms","id","count","silent","prototype","getOwnPropertyDescriptor","module","exports"],"sources":["../../src/models/Accommodation.js"],"sourcesContent":["/* eslint-disable no-unused-vars */\nimport { DataError } from \"@themost/common\";\nimport { DataObject, EdmMapping } from \"@themost/data\";\n\n\n@EdmMapping.entityType('Accommodation')\nclass AccommodationRequestEvent extends DataObject {\n    /**\n     * @constructor\n     */\n    constructor() {\n        super();\n    }\n\n    /**\n    * POST AccommodationRequestEvents/:id/Remove\n    */\n\n    //remove accommodation request event\n    @EdmMapping.param('data', 'Object', false, true)\n    @EdmMapping.action('remove', 'Accommodation')\n    async remove(data) {\n        /**\n        * @type {import('@themost/data').DataModel}\n        */\n\n        const model = this.getModel();\n\n        const item = await model.where('id')\n            .equal(this.getId())\n            .getItem();\n        const translateService = this.context.application.getStrategy(function TranslateService() { });\n\n        if (item == null) {\n            throw new DataError('E_ACCOMMODATION', translateService.translate('The specified Accommodation cannot be found or is inaccessible.'));\n        }\n\n        const hasRooms = await this.context.model('AccommodationRooms')\n            .where('containedInPlace').equal(item.id).count();\n\n        if (hasRooms) {\n            throw new DataError('E_ACCOMMODATION_ROOM', translateService.translate('Cannot remove accommodation. Accommodation is related to rooms.'), null, 'Accommodation');\n        }\n\n        return model.silent().remove(item);\n    }\n\n\n  \n}\n\nmodule.exports = AccommodationRequestEvent;\n"],"mappings":"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"}