feat(scheduler-service): SFO-102 add permissions in calendar (#42)

* feat(scheduler-service): add permissions in calendar
sourcefuse · Jul 6, 2020 · 12d1868 · 12d1868
1 parent 35e9ecd
commit 12d1868
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 11 deletions.
diff --git a/services/scheduler-service/src/controllers/calendar.controller.ts b/services/scheduler-service/src/controllers/calendar.controller.ts
@@ -66,7 +66,9 @@ export class CalendarController {
   @authenticate(STRATEGY.BEARER, {
     passReqToCallback: true,
   })
-  @authorize([PermissionKey.CreateCalendar])
+  @authorize([
+    PermissionKey.CreateCalendar
+  ])
   @post(basePath, {
     responses: {
       [STATUS_CODE.OK]: {
@@ -94,10 +96,12 @@ export class CalendarController {
   @authenticate(STRATEGY.BEARER, {
     passReqToCallback: true,
   })
-  @authorize([PermissionKey.CreateCalendar])
+  @authorize([
+    PermissionKey.CreateCalendar
+  ])
   @post('/calendars/calendarSubscription', {
     responses: {
-      '200': {
+      [STATUS_CODE.OK]: {
         description: calendarModelInstance,
         content: {'application/json': {schema: getModelSchemaRef(CalendarDTO)}},
       },
@@ -123,26 +127,41 @@ export class CalendarController {
 
     delete calendarDTO.subscription;
     let response = await this.calendarService.createCalendar(calendarDTO);
-
     let identifierType = this.schdulerConfig?.identifierMappedTo;
     if (!identifierType) {
       identifierType = IdentifierType.Id;
     }
+
+    let subscriptionIdentifier;
+    if(subscription.identifier){
+      subscriptionIdentifier = subscription.identifier;
+    }
+    else{
+      subscriptionIdentifier = this.currentUser[identifierType];
+    }
 
-    const subscriptionList = await this.subscriptionRepository.find({
-      where: {
-        identifier: this.currentUser[identifierType],
-      },
-    });
+    const where = {
+      and: [
+        {identifier: subscriptionIdentifier},
+        {isPrimary: true}
+      ]
+    };
 
+    const subscriptionList = await this.subscriptionRepository.find({where});
     if (subscriptionList.length > 0) {
       subscription.isPrimary = false;
     } else {
       subscription.isPrimary = true;
     }
+
     if (response.id) {
       subscription.calendarId = response.id;
-      subscription.identifier = calendarDTO.identifier;
+      if(subscriptionIdentifier){
+        subscription.identifier = subscriptionIdentifier;
+      }
+      else{
+        throw new HttpErrors.NotFound(ErrorKeys.SubscriptionIdentifierNotExist);
+      }
       subscription.accessRole = AccessRoleType.Owner;
       const subscriptionResponse = await this.subscriptionRepository.create(
         subscription,
@@ -273,7 +292,9 @@ export class CalendarController {
   @authenticate(STRATEGY.BEARER, {
     passReqToCallback: true,
   })
-  @authorize([PermissionKey.UpdateCalendar])
+  @authorize([
+    PermissionKey.UpdateCalendar
+  ])
   @put(`${basePath}/{id}`, {
     responses: {
       [STATUS_CODE.NO_CONTENT]: {

diff --git a/services/scheduler-service/src/models/enums/error-keys.ts b/services/scheduler-service/src/models/enums/error-keys.ts
@@ -4,6 +4,7 @@ export const enum ErrorKeys {
   PrimaryCalendarNotExist = 'Primary Calendar Not Exist',
   EventNotExist = 'Event Not Exist',
   SubscriptionNotExist = 'Subscription Not exist',
+  SubscriptionIdentifierNotExist = 'Subscription Identifier Not exist',
   IdNotExist = 'Id Not Exist',
 
   //unprocessable