fix(core): remove en.json changes (#29)

SFO-92
sourcefuse · Jun 23, 2020 · 09c513e · 09c513e
1 parent 3a577f5
commit 09c513e
Show file tree

Hide file tree

Showing 11 changed files with 42 additions and 21 deletions.
diff --git a/packages/core/locales/en.json b/packages/core/locales/en.json
@@ -1,3 +1,3 @@
 {
-  "NotAllowedAccess": "NotAllowedAccess"
-}
+	"NotAllowedAccess": "NotAllowedAccess"
+}
diff --git a/sandbox/testing/src/controllers/ping.controller.ts b/sandbox/testing/src/controllers/ping.controller.ts
@@ -33,7 +33,9 @@ const PING_RESPONSE: ResponseObject = {
  * A simple controller to bounce back http requests
  */
 export class PingController {
-  constructor(@inject(RestBindings.Http.REQUEST) private readonly req: Request) {}
+  constructor(
+    @inject(RestBindings.Http.REQUEST) private readonly req: Request,
+  ) {}
 
   // Map to `GET /ping`
   @authorize(['*'])

diff --git a/services/scheduler-service/.prettierignore b/services/scheduler-service/.prettierignore
@@ -1,3 +1,5 @@
 dist
 *.json
-migrations/
+migrations/
+coverage/
+.nyc_output 
diff --git a/services/scheduler-service/src/__tests__/unit/validator.service.unit.ts b/services/scheduler-service/src/__tests__/unit/validator.service.unit.ts
@@ -19,7 +19,7 @@ import {
   Subscription,
 } from '../../models';
 import {Filter} from '@loopback/repository';
-import { IdentifierType } from '../../models/enums/identifier-type.enum';
+import {IdentifierType} from '../../models/enums/identifier-type.enum';
 
 describe('Validator Service', () => {
   let calendarRepo: StubbedInstanceWithSinonAccessor<CalendarRepository>;
@@ -102,7 +102,10 @@ describe('Validator Service', () => {
       });
       const filter: Filter = {
         where: {
-          and: [{identifier: currentUser[IdentifierType.Id]}, {isPrimary: true}],
+          and: [
+            {identifier: currentUser[IdentifierType.Id]},
+            {isPrimary: true},
+          ],
         },
       };
       const findOne = subscriptionRepo.stubs.findOne;
@@ -117,7 +120,10 @@ describe('Validator Service', () => {
       const id = 'primary';
       const filter: Filter = {
         where: {
-          and: [{identifier: currentUser[IdentifierType.Id]}, {isPrimary: true}],
+          and: [
+            {identifier: currentUser[IdentifierType.Id]},
+            {isPrimary: true},
+          ],
         },
       };
       const findOne = subscriptionRepo.stubs.findOne;

diff --git a/services/scheduler-service/src/controllers/subscription.controller.ts b/services/scheduler-service/src/controllers/subscription.controller.ts
@@ -33,9 +33,9 @@ import {AccessRoleType} from '../models/enums/access-role.enum';
 import {PermissionKey} from '../models/enums/permission-key.enum';
 import {SubscriptionRepository} from '../repositories';
 import {ValidatorService} from '../services/validator.service';
-import { ISchedulerConfig } from '../types';
-import { SchedulerBindings } from '../keys';
-import { IdentifierType } from '../models/enums/identifier-type.enum';
+import {ISchedulerConfig} from '../types';
+import {SchedulerBindings} from '../keys';
+import {IdentifierType} from '../models/enums/identifier-type.enum';
 
 const basePath = '/subscriptions';
 
@@ -49,7 +49,7 @@ export class SubscriptionController {
     @inject(SchedulerBindings.Config, {
       optional: true,
     })
-    private readonly schdulerConfig?: ISchedulerConfig
+    private readonly schdulerConfig?: ISchedulerConfig,
   ) {}
 
   @authenticate(STRATEGY.BEARER, {
@@ -124,7 +124,7 @@ export class SubscriptionController {
     @param.query.string('minAccessRole') minAccessRole?: AccessRoleType,
   ): Promise<Subscription[]> {
     let identifierType = this.schdulerConfig?.identifierMappedTo;
-    if (!identifierType){
+    if (!identifierType) {
       identifierType = IdentifierType.Id;
     }
     return this.subscriptionRepository.find({

diff --git a/services/scheduler-service/src/models/attendee.model.ts b/services/scheduler-service/src/models/attendee.model.ts
@@ -20,7 +20,7 @@ export class Attendee extends UserModifiableEntity
   @property({
     type: 'string',
     required: true,
-    name:'identifier',
+    name: 'identifier',
     jsonSchema: {
       maxLength: 200,
     },

diff --git a/services/scheduler-service/src/models/enums/identifier-type.enum.ts b/services/scheduler-service/src/models/enums/identifier-type.enum.ts
@@ -2,5 +2,5 @@ export const enum IdentifierType {
   Email = 'email',
   Id = 'id',
   TenantId = 'tenantId',
-  UserTenantId = 'userTenantId'
+  UserTenantId = 'userTenantId',
 }
diff --git a/services/scheduler-service/src/models/enums/index.ts b/services/scheduler-service/src/models/enums/index.ts
@@ -0,0 +1,8 @@
+export * from './access-role.enum';
+export * from './day-of-week.enum';
+export * from './error-keys';
+export * from './identifier-type.enum';
+export * from './owner-type.enum';
+export * from './permission-key.enum';
+export * from './response-status.enum';
+export * from './status.enum';
diff --git a/services/scheduler-service/src/models/subscription.model.ts b/services/scheduler-service/src/models/subscription.model.ts
@@ -63,7 +63,7 @@ export class Subscription extends UserModifiableEntity
   @property({
     type: 'string',
     required: true,
-    name:'identifier'
+    name: 'identifier',
   })
   identifier: string;
 

diff --git a/services/scheduler-service/src/services/validator.service.ts b/services/scheduler-service/src/services/validator.service.ts
@@ -7,9 +7,9 @@ import {
   EventRepository,
   SubscriptionRepository,
 } from '../repositories';
-import { ISchedulerConfig } from '../types';
-import { SchedulerBindings } from '../keys';
-import { IdentifierType } from '../models/enums/identifier-type.enum';
+import {ISchedulerConfig} from '../types';
+import {SchedulerBindings} from '../keys';
+import {IdentifierType} from '../models/enums/identifier-type.enum';
 
 @bind({scope: BindingScope.TRANSIENT})
 export class ValidatorService {
@@ -67,12 +67,15 @@ export class ValidatorService {
   async primaryToCalendarId(id: string) {
     if (id === 'primary') {
       let identifierType = this.schdulerConfig?.identifierMappedTo;
-      if (!identifierType){
+      if (!identifierType) {
         identifierType = IdentifierType.Id;
       }
       const subcription = await this.subscriptionRepository.findOne({
         where: {
-          and: [{identifier: this.currentUser[identifierType]}, {isPrimary: true}],
+          and: [
+            {identifier: this.currentUser[identifierType]},
+            {isPrimary: true},
+          ],
         },
       });
       if (subcription) {

diff --git a/services/scheduler-service/src/types.ts b/services/scheduler-service/src/types.ts
@@ -1,5 +1,5 @@
 import {IAuthUserWithPermissions} from '@sourceloop/core';
-import { IdentifierType } from './models/enums/identifier-type.enum';
+import {IdentifierType} from './models/enums/identifier-type.enum';
 
 export interface CustomPermissionFn {
   (user: IAuthUserWithPermissions): Promise<boolean>;