refactor: update findFullCompanyInfoByUserId method and deprecate unused code

backend/src/entities/company-info/repository/company-info-custom-repository.extension.ts

@@ -48,23 +48,6 @@ export const companyInfoRepositoryExtension: ICompanyInfoRepository = {
       .getOne();
   },
 
-  // returns groups and connections where user is invited
-  async findFullCompanyInfoByUserId(userId: string): Promise<CompanyInfoEntity> {
-    return await this.createQueryBuilder('company_info')
-      .leftJoinAndSelect('company_info.logo', 'logo')
-      .leftJoinAndSelect('company_info.favicon', 'favicon')
-      .leftJoinAndSelect('company_info.tab_title', 'tab_title')
-      .leftJoinAndSelect('company_info.users', 'current_user')
-      .leftJoinAndSelect('company_info.users', 'users')
-      .leftJoinAndSelect('company_info.connections', 'connections')
-      .leftJoinAndSelect('company_info.invitations', 'invitations')
-      .leftJoinAndSelect('connections.groups', 'groups')
-      .leftJoinAndSelect('connections.author', 'connection_author')
-      .leftJoinAndSelect('groups.users', 'groups_users')
-      .where('current_user.id = :userId', { userId })
-      .getOne();
-  },
-
   async findFullCompanyInfoByCompanyId(companyId: string): Promise<CompanyInfoEntity> {
     return await this.createQueryBuilder('company_info')
       .leftJoinAndSelect('company_info.users', 'current_user')
@@ -90,23 +73,39 @@ export const companyInfoRepositoryExtension: ICompanyInfoRepository = {
       .getOne();
   },
 
-  // temporary solution to handle "old" connections (case, when connection not attached to any company
-  // will be removed in during architecture refactoring)
-  async findAllCompanyWithConnectionsUsersJoining(companyId: string): Promise<CompanyInfoEntity> {
+  // returns groups and connections where user is invited
+  async findFullCompanyInfoByUserId(userId: string): Promise<CompanyInfoEntity> {
     return await this.createQueryBuilder('company_info')
-      .leftJoinAndSelect('company_info.users', 'users')
       .leftJoinAndSelect('company_info.logo', 'logo')
       .leftJoinAndSelect('company_info.favicon', 'favicon')
       .leftJoinAndSelect('company_info.tab_title', 'tab_title')
-      .leftJoinAndSelect('users.groups', 'groups')
-      .leftJoinAndSelect('groups.connection', 'connections')
+      .leftJoinAndSelect('company_info.users', 'current_user')
+      .leftJoinAndSelect('company_info.users', 'users')
+      .leftJoinAndSelect('company_info.connections', 'connections')
+      .leftJoinAndSelect('company_info.invitations', 'invitations')
+      .leftJoinAndSelect('connections.groups', 'groups')
       .leftJoinAndSelect('connections.author', 'connection_author')
-      .leftJoinAndSelect('connections.groups', 'connection_groups')
-      .leftJoinAndSelect('connection_groups.users', 'connection_groups_users')
-      .where('company_info.id = :companyId', { companyId })
+      .leftJoinAndSelect('groups.users', 'groups_users')
+      .where('current_user.id = :userId', { userId })
       .getOne();
   },
 
+  //todo deprecated code, will be removed in future
+  // async findAllCompanyWithConnectionsUsersJoining(companyId: string): Promise<CompanyInfoEntity> {
+  //   return await this.createQueryBuilder('company_info')
+  //     .leftJoinAndSelect('company_info.users', 'users')
+  //     .leftJoinAndSelect('company_info.logo', 'logo')
+  //     .leftJoinAndSelect('company_info.favicon', 'favicon')
+  //     .leftJoinAndSelect('company_info.tab_title', 'tab_title')
+  //     .leftJoinAndSelect('users.groups', 'groups')
+  //     .leftJoinAndSelect('groups.connection', 'connections')
+  //     .leftJoinAndSelect('connections.author', 'connection_author')
+  //     .leftJoinAndSelect('connections.groups', 'connection_groups')
+  //     .leftJoinAndSelect('connection_groups.users', 'connection_groups_users')
+  //     .where('company_info.id = :companyId', { companyId })
+  //     .getOne();
+  // },
+
   async findCompanyInfosByUserEmail(userEmail: string): Promise<CompanyInfoEntity[]> {
     return await this.createQueryBuilder('company_info')
       .leftJoinAndSelect('company_info.users', 'users')

backend/src/entities/company-info/repository/company-info-repository.interface.ts

@@ -20,7 +20,8 @@ export interface ICompanyInfoRepository {
 
   findUserCompanyWithUsers(userId: string): Promise<CompanyInfoEntity>;
 
-  findAllCompanyWithConnectionsUsersJoining(companyId: string): Promise<CompanyInfoEntity>;
+  //todo deprecated code, will be removed in future
+  // findAllCompanyWithConnectionsUsersJoining(companyId: string): Promise<CompanyInfoEntity>;
 
   findFullCompanyInfoByCompanyId(companyId: string): Promise<CompanyInfoEntity>;
 

backend/src/entities/company-info/use-cases/get-full-user-company-info.use.case.ts

@@ -44,26 +44,32 @@ export class GetUserCompanyFullInfoUseCase
       foundCompanyInfoByUserId.id,
     );
 
-    let foundFullUserCoreCompanyInfo: CompanyInfoEntity;
+    const foundFullUserCoreCompanyInfo: CompanyInfoEntity =
+      await this._dbContext.companyInfoRepository.findFullCompanyInfoByUserId(userId);
 
-    if (foundUser.role === UserRoleEnum.ADMIN) {
-      //todo will be reworked in architecture refactoring
-      const companyId = foundCompanyInfoByUserId.id;
+      //todo deprecated code, will be removed in future
+    // if (foundUser.role === UserRoleEnum.ADMIN) {
 
-      const [companyInfoWithoutConnections, companyInfoWithUsers] = await Promise.all([
-        this._dbContext.companyInfoRepository.findCompanyInfoByCompanyIdWithoutConnections(companyId),
-        this._dbContext.companyInfoRepository.findAllCompanyWithConnectionsUsersJoining(companyId),
-      ]);
+    //   const companyId = foundCompanyInfoByUserId.id;
 
-      const uniqueConnections = companyInfoWithUsers.users
-        .flatMap((user) => user.groups.map((group) => group.connection))
-        .filter((connection, index, self) => index === self.findIndex((t) => t.id === connection.id));
+    //   const [companyInfoWithoutConnections, companyInfoWithUsers] = await Promise.all([
+    //     this._dbContext.companyInfoRepository.findCompanyInfoByCompanyIdWithoutConnections(companyId),
+    //     this._dbContext.companyInfoRepository.findAllCompanyWithConnectionsUsersJoining(companyId),
+    //   ]);
 
-      companyInfoWithoutConnections.connections = uniqueConnections;
-      foundFullUserCoreCompanyInfo = companyInfoWithoutConnections;
-    } else {
-      foundFullUserCoreCompanyInfo = await this._dbContext.companyInfoRepository.findFullCompanyInfoByUserId(userId);
-    }
+    //   const uniqueConnections = companyInfoWithUsers.users
+    //     .flatMap((user) => user.groups.map((group) => group.connection))
+    //     .filter((connection, index, self) => index === self.findIndex((t) => t.id === connection.id));
+
+    //   companyInfoWithoutConnections.connections = uniqueConnections;
+    //   foundFullUserCoreCompanyInfo = companyInfoWithoutConnections;
+    //   console.log(
+    //     '🚀 ~ GetUserCompanyFullInfoUseCase ~ implementation ~ foundFullUserCoreCompanyInfo:',
+    //     foundFullUserCoreCompanyInfo,
+    //   );
+    // } else {
+    //   foundFullUserCoreCompanyInfo = await this._dbContext.companyInfoRepository.findFullCompanyInfoByUserId(userId);
+    // }
 
     let foundUserCompanySaasInfo = null;
 

backend/src/entities/user/application/data-structures/usual-register-user.ds.ts

@@ -16,8 +16,8 @@ export class UsualRegisterUserDs {
 }
 
 export class SaasUsualUserRegisterDS extends UsualRegisterUserDs {
-  @ApiProperty({ required: false })
-  companyId?: string;
+  @ApiProperty({ required: true })
+  companyId: string;
 
   @ApiProperty({ required: false, enum: UserRoleEnum })
   userRole?: UserRoleEnum;

backend/src/microservices/saas-microservice/saas.controller.ts

@@ -1,4 +1,16 @@
-import { Body, Controller, Get, Inject, Injectable, Param, Post, Put, Query, UseInterceptors } from '@nestjs/common';
+import {
+  BadRequestException,
+  Body,
+  Controller,
+  Get,
+  Inject,
+  Injectable,
+  Param,
+  Post,
+  Put,
+  Query,
+  UseInterceptors,
+} from '@nestjs/common';
 import { ApiBearerAuth, ApiBody, ApiOperation, ApiResponse, ApiTags } from '@nestjs/swagger';
 import { UseCaseType } from '../../common/data-injection.tokens.js';
 import { CompanyInfoEntity } from '../../entities/company-info/company-info.entity.js';
@@ -29,6 +41,7 @@ import {
   ISuspendUsers,
 } from './use-cases/saas-use-cases.interface.js';
 import { SkipThrottle } from '@nestjs/throttler';
+import { Messages } from '../../exceptions/text/messages.js';
 
 @UseInterceptors(SentryInterceptor)
 @SkipThrottle()
@@ -122,7 +135,9 @@ export class SaasController {
     @Body('companyId') companyId: string,
     @Body('companyName') companyName: string,
   ): Promise<FoundUserDto> {
-    companyId = companyId ? companyId : null;
+    if (!companyId) {
+      throw new BadRequestException(Messages.COMPANY_ID_MISSING);
+    }
     return await this.usualRegisterUserUseCase.execute({ email, password, gclidValue, name, companyId, companyName });
   }
 

backend/src/microservices/saas-microservice/use-cases/register-company-webhook.use.case.ts

@@ -41,14 +41,14 @@ export class RegisteredCompanyWebhookUseCase
         HttpStatus.BAD_REQUEST,
       );
     }
-    foundUser.role = UserRoleEnum.ADMIN;
-    await this._dbContext.userRepository.saveUserEntity(foundUser);
+
     const newCompanyInfo = new CompanyInfoEntity();
     newCompanyInfo.name = companyName ? companyName : 'New Company';
     newCompanyInfo.id = companyId;
     newCompanyInfo.show_test_connections = true;
     const savedCompanyInfo = await this._dbContext.companyInfoRepository.save(newCompanyInfo);
     foundUser.company = savedCompanyInfo;
+    foundUser.role = UserRoleEnum.ADMIN;
     const savedUser = await this._dbContext.userRepository.saveUserEntity(foundUser);
     return {
       userId: savedUser.id,