Merge pull request #285 from SCVApp/master

Optimze user fatching

Author: urbankrepel

src/lockers/lockers.service.ts

@@ -159,6 +159,7 @@ export class LockersService {
       userAccessToken,
     );
     if (!user) {
+      this.logger.error('User not found');
       throw new NotFoundException('User not found');
     }
 

src/notification/notification.service.ts

@@ -99,14 +99,14 @@ export class NotificationService {
     azure_id: string,
     device_id: string,
     accessToken: string,
-  ) {
+  ): Promise<void> {
     const user = await this.passService.getUserFromAzureId(
       azure_id,
       accessToken,
     );
 
     if (!user) {
-      throw new NotFoundException('User not found');
+      return;
     }
 
     await this.passService.getUserAccessLevel(user, accessToken);
@@ -134,7 +134,7 @@ export class NotificationService {
     try {
       await this.deviceRepository.save(newDevice);
     } catch (e) {
-      this.logger.error(e);
+      this.logger.error("Couldn't save device", e);
     }
   }
 

src/pass/service/pass.service.ts

@@ -47,39 +47,30 @@ export class PassService {
     private readonly passGateway: PassGateway,
   ) {}
   private openDoor: string[] = [];
-  async getUserFromAzureId(azureId: string = '', accessToken: string) {
+  async getUserFromAzureId(azureId: string, accessToken: string) {
     if (accessToken === '') {
       throw new UnauthorizedException("accessToken can't be empty");
     }
-    let userFromAzure = undefined;
-    if (azureId === '') {
-      userFromAzure = await this.userService.getMe(accessToken);
-      if (!userFromAzure || !userFromAzure.id) {
+    if (!azureId || azureId === '') {
+      const userFromAzure = await this.userService.getMe(accessToken);
+      if (!userFromAzure || !userFromAzure.id || userFromAzure.id === '') {
         return null;
       }
+      azureId = userFromAzure.id;
     }
     const user = await this.userPassRepository.findOne({
-      where: { azure_id: azureId === '' ? userFromAzure.id : azureId },
+      where: { azure_id: azureId },
     });
     if (user) {
       return user;
     }
     try {
-      if (azureId !== '') {
-        userFromAzure = await this.searchService.searchSpecificUser(
-          accessToken,
-          azureId,
-        );
-      }
-      if (!userFromAzure && !userFromAzure.id) {
-        return null;
-      }
-      return this.userPassRepository.save({
-        azure_id: userFromAzure.id,
+      return await this.userPassRepository.save({
+        azure_id: azureId,
       });
     } catch (e) {
       return await this.userPassRepository.findOne({
-        where: { azure_id: azureId === '' ? userFromAzure.id : azureId },
+        where: { azure_id: azureId },
       });
     }
   }