Calling organizations fix

server/src/organization/organization.gateway.ts

@@ -14,17 +14,20 @@ import {
   UpdateOrganizationDataDto,
 } from './organization.dto';
 import { OrganizationService } from './organization.service';
-import { UserService } from '../user/user.service';
 
 @WebSocketGateway({ cors: true })
 @UseGuards(UserGuard)
 export class OrganizationGateway {
   constructor(
     private clientService: ClientService,
     private orgService: OrganizationService,
-    private userService: UserService,
   ) {}
 
+  /**
+   * Requests organization based on RequestOrganizationDataDto. Subscribes and emits the requested information
+   * @param user The calling user
+   * @param data The data to be requested
+   */
   @SubscribeMessage('requestOrganizationData')
   async requestOrganizationData(
     @CallingUser() user: User,
@@ -48,6 +51,12 @@ export class OrganizationGateway {
     }
   }
 
+  /**
+   * Updates organization based on UpdateOrganizationDataDto. Subscribes and emits data
+   * @param user The calling user
+   * @param data The data to be updated
+   * @returns Emits update organization
+   */
   @SubscribeMessage('updateOrganizationData')
   async updateOrganizationData(
     @CallingUser() user: User,
@@ -73,39 +82,4 @@ export class OrganizationGateway {
       await this.orgService.emitUpdateOrganizationData(org, false);
     }
   }
-
-  @SubscribeMessage('addManager')
-  async addManager(
-    @CallingUser() user: User,
-    @MessageBody() data: { email: string; organizationId: string },
-  ) {
-    if (!user.administrator) return;
-
-    await this.orgService.addManager(user, data.email, data.organizationId);
-
-    const org = await this.orgService.getOrganizationById(data.organizationId);
-    await this.orgService.emitUpdateOrganizationData(org, false);
-
-    const manager = await this.userService.byEmail(data.email);
-    await this.userService.emitUpdateUserData(
-      manager,
-      false,
-      false,
-      true,
-      user,
-    );
-  }
-
-  @SubscribeMessage('joinOrganization')
-  async joinOrganization(
-    @CallingUser() user: User,
-    @MessageBody() data: { accessCode: string },
-  ) {
-    await this.orgService.joinOrganization(user, data.accessCode);
-
-    const org = await this.orgService.getOrganizationByCode(data.accessCode);
-    await this.orgService.emitUpdateOrganizationData(org, false);
-
-    await this.userService.emitUpdateUserData(user, false, false, true);
-  }
 }

server/src/organization/organization.module.ts

@@ -1,11 +1,13 @@
-import { Module } from '@nestjs/common';
+import { Module, forwardRef } from '@nestjs/common';
 import { ClientModule } from '../client/client.module';
 import { PrismaModule } from '../prisma/prisma.module';
 import { OrganizationService } from './organization.service';
+import { OrganizationGateway } from './organization.gateway';
+import { AuthModule } from '../auth/auth.module';
 
 @Module({
-  imports: [PrismaModule, ClientModule],
-  exports: [OrganizationService],
-  providers: [OrganizationService],
+  imports: [PrismaModule, ClientModule, forwardRef(() => AuthModule)],
+  exports: [OrganizationService, OrganizationGateway],
+  providers: [OrganizationService, OrganizationGateway],
 })
 export class OrganizationModule {}

server/src/user/user.gateway.spec.ts

@@ -5,6 +5,7 @@ import { UserService } from './user.service';
 import { GroupService } from '../group/group.service';
 import { EventService } from '../event/event.service';
 import { AuthService } from '../auth/auth.service';
+import { OrganizationService } from '../organization/organization.service';
 
 describe('UserGateway', () => {
   let gateway: UserGateway;
@@ -33,6 +34,10 @@ describe('UserGateway', () => {
           useValue: null,
           provide: AuthService,
         },
+        {
+          useValue: null,
+          provide: OrganizationService,
+        },
       ],
     }).compile();
 

server/src/user/user.gateway.ts

@@ -30,6 +30,7 @@ import {
 } from './user.dto';
 import { UserService } from './user.service';
 import { readFileSync } from 'fs';
+import { OrganizationService } from '../organization/organization.service';
 
 const majors = readFileSync('/app/server/src/user/majors.txt', 'utf8').split(
   '\n',
@@ -46,6 +47,7 @@ export class UserGateway {
     private userService: UserService,
     private groupService: GroupService,
     private eventService: EventService,
+    private orgService: OrganizationService,
   ) {}
 
   private providerToAuthType(provider: string) {
@@ -234,6 +236,41 @@ export class UserGateway {
     }
   }
 
+  @SubscribeMessage('addManager')
+  async addManager(
+    @CallingUser() user: User,
+    @MessageBody() data: { email: string; organizationId: string },
+  ) {
+    if (!user.administrator) return;
+
+    await this.orgService.addManager(user, data.email, data.organizationId);
+
+    const org = await this.orgService.getOrganizationById(data.organizationId);
+    await this.orgService.emitUpdateOrganizationData(org, false);
+
+    const manager = await this.userService.byEmail(data.email);
+    await this.userService.emitUpdateUserData(
+      manager,
+      false,
+      false,
+      true,
+      user,
+    );
+  }
+
+  @SubscribeMessage('joinOrganization')
+  async joinOrganization(
+    @CallingUser() user: User,
+    @MessageBody() data: { accessCode: string },
+  ) {
+    await this.orgService.joinOrganization(user, data.accessCode);
+
+    const org = await this.orgService.getOrganizationByCode(data.accessCode);
+    await this.orgService.emitUpdateOrganizationData(org, false);
+
+    await this.userService.emitUpdateUserData(user, false, false, true);
+  }
+
   @SubscribeMessage('closeAccount')
   async closeAccount(
     @CallingUser() user: User,