Skip to content

Commit d77c9ff

Browse files
authored
Merge pull request #1177 from rocket-admin/backend_fix_get_company_info_saas_request
refactor: reorganize imports and remove unused table settings logic in LoginUserWithGithubUseCase
2 parents 25d0463 + c82ddd4 commit d77c9ff

1 file changed

Lines changed: 10 additions & 20 deletions

File tree

backend/src/microservices/saas-microservice/use-cases/login-with-github.use.case.ts

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,21 @@ import { Inject, Injectable, InternalServerErrorException } from '@nestjs/common
22
import AbstractUseCase from '../../../common/abstract-use.case.js';
33
import { IGlobalDatabaseContext } from '../../../common/application/global-database-context.interface.js';
44
import { BaseType } from '../../../common/data-injection.tokens.js';
5-
import { UserEntity } from '../../../entities/user/user.entity.js';
6-
import { SaasRegisterUserWithGithub } from '../data-structures/saas-register-user-with-github.js';
7-
import { ILoginUserWithGitHub } from './saas-use-cases.interface.js';
8-
import { RegisterUserDs } from '../../../entities/user/application/data-structures/register-user-ds.js';
9-
import { buildUserGitHubIdentifierEntity } from '../../../entities/user/utils/build-github-identifier-entity.js';
105
import { ConnectionEntity } from '../../../entities/connection/connection.entity.js';
116
import { GroupEntity } from '../../../entities/group/group.entity.js';
127
import { PermissionEntity } from '../../../entities/permission/permission.entity.js';
13-
import { TableSettingsEntity } from '../../../entities/table-settings/table-settings.entity.js';
8+
import { RegisterUserDs } from '../../../entities/user/application/data-structures/register-user-ds.js';
9+
import { ExternalRegistrationProviderEnum } from '../../../entities/user/enums/external-registration-provider.enum.js';
10+
import { UserRoleEnum } from '../../../entities/user/enums/user-role.enum.js';
11+
import { UserEntity } from '../../../entities/user/user.entity.js';
1412
import { buildConnectionEntitiesFromTestDtos } from '../../../entities/user/utils/build-connection-entities-from-test-dtos.js';
1513
import { buildDefaultAdminGroups } from '../../../entities/user/utils/build-default-admin-groups.js';
1614
import { buildDefaultAdminPermissions } from '../../../entities/user/utils/build-default-admin-permissions.js';
17-
import { buildTestTableSettings } from '../../../entities/user/utils/build-test-table-settings.js';
18-
import { Constants } from '../../../helpers/constants/constants.js';
15+
import { buildUserGitHubIdentifierEntity } from '../../../entities/user/utils/build-github-identifier-entity.js';
1916
import { Messages } from '../../../exceptions/text/messages.js';
20-
import { ExternalRegistrationProviderEnum } from '../../../entities/user/enums/external-registration-provider.enum.js';
21-
import { UserRoleEnum } from '../../../entities/user/enums/user-role.enum.js';
17+
import { Constants } from '../../../helpers/constants/constants.js';
18+
import { SaasRegisterUserWithGithub } from '../data-structures/saas-register-user-with-github.js';
19+
import { ILoginUserWithGitHub } from './saas-use-cases.interface.js';
2220

2321
@Injectable()
2422
export class LoginUserWithGithubUseCase
@@ -59,6 +57,7 @@ export class LoginUserWithGithubUseCase
5957
userData,
6058
ExternalRegistrationProviderEnum.GITHUB,
6159
);
60+
6261
const newUserGitHubIdentifier = buildUserGitHubIdentifierEntity(savedUser, Number(githubId));
6362
await this._dbContext.userGitHubIdentifierRepository.saveGitHubIdentifierEntity(newUserGitHubIdentifier);
6463

@@ -82,16 +81,7 @@ export class LoginUserWithGithubUseCase
8281
await this._dbContext.permissionRepository.saveNewOrUpdatedPermission(permission);
8382
}),
8483
);
85-
const testTableSettingsArrays: Array<Array<TableSettingsEntity>> = buildTestTableSettings(createdTestConnections);
86-
87-
for (const tableSettingsArray of testTableSettingsArrays) {
88-
await Promise.all(
89-
tableSettingsArray.map(async (tableSettings: TableSettingsEntity) => {
90-
await this._dbContext.tableSettingsRepository.saveNewOrUpdatedSettings(tableSettings);
91-
}),
92-
);
93-
}
94-
84+
9585
return savedUser;
9686
} catch (_e) {
9787
throw new InternalServerErrorException(Messages.GITHUB_REGISTRATION_FAILED);

0 commit comments

Comments
 (0)