mukeshs/twenty_crm
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Refactor backend folder structure (#4505)

Browse Source 
* Refactor backend folder structure

Co-authored-by: Charles Bochet <charles@twenty.com>

* fix tests

* fix

* move yoga hooks

---------

Co-authored-by: Charles Bochet <charles@twenty.com>
This commit is contained in:
Weiko
2024-03-15 18:37:09 +01:00
committed by GitHub
parent afb9b3e375
commit 2c09096edd
523 changed files with 1386 additions and 1856 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/twenty-server/src/engine/modules/auth/auth.module.ts
View File

@ -4,7 +4,7 @@ import { JwtModule } from '@nestjs/jwt';
import { TypeOrmModule } from '@nestjs/typeorm';
import { HttpModule } from '@nestjs/axios';
import { EnvironmentService } from 'src/integrations/environment/environment.service';
import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
import { FileModule } from 'src/engine/modules/file/file.module';
import { Workspace } from 'src/engine/modules/workspace/workspace.entity';
import { User } from 'src/engine/modules/user/user.entity';

2
packages/twenty-server/src/engine/modules/auth/controllers/google-apis-auth.controller.ts
View File

@ -7,7 +7,7 @@ import { GoogleAPIsOauthGuard } from 'src/engine/modules/auth/guards/google-apis
import { GoogleAPIsRequest } from 'src/engine/modules/auth/strategies/google-apis.auth.strategy';
import { GoogleAPIsService } from 'src/engine/modules/auth/services/google-apis.service';
import { TokenService } from 'src/engine/modules/auth/services/token.service';
import { EnvironmentService } from 'src/integrations/environment/environment.service';
import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
@Controller('auth/google-apis')
export class GoogleAPIsAuthController {

2
packages/twenty-server/src/engine/modules/auth/controllers/google-auth.controller.ts
View File

@ -12,7 +12,7 @@ import { User } from 'src/engine/modules/user/user.entity';
import { Workspace } from 'src/engine/modules/workspace/workspace.entity';
import { AuthService } from 'src/engine/modules/auth/services/auth.service';
import { TypeORMService } from 'src/database/typeorm/typeorm.service';
import { EnvironmentService } from 'src/integrations/environment/environment.service';
import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
@Controller('auth/google')
export class GoogleAuthController {

2
packages/twenty-server/src/engine/modules/auth/controllers/google-gmail-auth.controller.ts
View File

@ -7,7 +7,7 @@ import { GoogleAPIsProviderEnabledGuard } from 'src/engine/modules/auth/guards/g
import { GoogleAPIsService } from 'src/engine/modules/auth/services/google-apis.service';
import { TokenService } from 'src/engine/modules/auth/services/token.service';
import { GoogleAPIsRequest } from 'src/engine/modules/auth/strategies/google-apis.auth.strategy';
import { EnvironmentService } from 'src/integrations/environment/environment.service';
import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
@Controller('auth/google-gmail')
export class GoogleGmailAuthController {

2
packages/twenty-server/src/engine/modules/auth/guards/google-apis-provider-enabled.guard.ts
View File

@ -3,7 +3,7 @@ import { Injectable, CanActivate, NotFoundException } from '@nestjs/common';
import { Observable } from 'rxjs';
import { GoogleAPIsStrategy } from 'src/engine/modules/auth/strategies/google-apis.auth.strategy';
import { EnvironmentService } from 'src/integrations/environment/environment.service';
import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
@Injectable()
export class GoogleAPIsProviderEnabledGuard implements CanActivate {

2
packages/twenty-server/src/engine/modules/auth/guards/google-gmail-provider-enabled.guard.ts
View File

@ -3,7 +3,7 @@ import { Injectable, CanActivate, NotFoundException } from '@nestjs/common';
import { Observable } from 'rxjs';
import { GoogleAPIsStrategy } from 'src/engine/modules/auth/strategies/google-apis.auth.strategy';
import { EnvironmentService } from 'src/integrations/environment/environment.service';
import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
@Injectable()
export class GoogleGmailProviderEnabledGuard implements CanActivate {

2
packages/twenty-server/src/engine/modules/auth/guards/google-provider-enabled.guard.ts
View File

@ -2,7 +2,7 @@ import { Injectable, CanActivate, NotFoundException } from '@nestjs/common';
import { Observable } from 'rxjs';
import { EnvironmentService } from 'src/integrations/environment/environment.service';
import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
import { GoogleStrategy } from 'src/engine/modules/auth/strategies/google.auth.strategy';
@Injectable()

4
packages/twenty-server/src/engine/modules/auth/services/auth.service.spec.ts
View File

@ -5,8 +5,8 @@ import { UserService } from 'src/engine/modules/user/services/user.service';
import { WorkspaceManagerService } from 'src/engine/workspace-manager/workspace-manager.service';
import { Workspace } from 'src/engine/modules/workspace/workspace.entity';
import { User } from 'src/engine/modules/user/user.entity';
import { EnvironmentService } from 'src/integrations/environment/environment.service';
import { EmailService } from 'src/integrations/email/email.service';
import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
import { EmailService } from 'src/engine/integrations/email/email.service';
import { SignUpService } from 'src/engine/modules/auth/services/sign-up.service';
import { AuthService } from './auth.service';

4
packages/twenty-server/src/engine/modules/auth/services/auth.service.ts
View File

@ -23,8 +23,8 @@ import { WorkspaceInviteHashValid } from 'src/engine/modules/auth/dto/workspace-
import { User } from 'src/engine/modules/user/user.entity';
import { Workspace } from 'src/engine/modules/workspace/workspace.entity';
import { UserService } from 'src/engine/modules/user/services/user.service';
import { EnvironmentService } from 'src/integrations/environment/environment.service';
import { EmailService } from 'src/integrations/email/email.service';
import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
import { EmailService } from 'src/engine/integrations/email/email.service';
import { UpdatePassword } from 'src/engine/modules/auth/dto/update-password.entity';
import { SignUpService } from 'src/engine/modules/auth/services/sign-up.service';

10
packages/twenty-server/src/engine/modules/auth/services/google-apis.service.ts
View File

@ -7,17 +7,17 @@ import { Repository } from 'typeorm';
import { DataSourceService } from 'src/engine-metadata/data-source/data-source.service';
import { TypeORMService } from 'src/database/typeorm/typeorm.service';
import { SaveConnectedAccountInput } from 'src/engine/modules/auth/dto/save-connected-account';
import { MessageQueue } from 'src/integrations/message-queue/message-queue.constants';
import { MessageQueueService } from 'src/integrations/message-queue/services/message-queue.service';
import { MessageQueue } from 'src/engine/integrations/message-queue/message-queue.constants';
import { MessageQueueService } from 'src/engine/integrations/message-queue/services/message-queue.service';
import {
GmailFullSyncJob,
GmailFullSyncJobData,
} from 'src/business/modules/message/jobs/gmail-full-sync.job';
} from 'src/modules/messaging/jobs/gmail-full-sync.job';
import {
GoogleCalendarFullSyncJob,
GoogleCalendarFullSyncJobData,
} from 'src/business/modules/calendar/jobs/google-calendar-full-sync.job';
import { EnvironmentService } from 'src/integrations/environment/environment.service';
} from 'src/modules/calendar/jobs/google-calendar-full-sync.job';
import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
import {
FeatureFlagEntity,
FeatureFlagKeys,

2
packages/twenty-server/src/engine/modules/auth/services/sign-up.service.spec.ts
View File

@ -4,7 +4,7 @@ import { HttpService } from '@nestjs/axios';
import { Workspace } from 'src/engine/modules/workspace/workspace.entity';
import { User } from 'src/engine/modules/user/user.entity';
import { EnvironmentService } from 'src/integrations/environment/environment.service';
import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
import { SignUpService } from 'src/engine/modules/auth/services/sign-up.service';
import { FileUploadService } from 'src/engine/modules/file/services/file-upload.service';
import { UserWorkspaceService } from 'src/engine/modules/user-workspace/user-workspace.service';

2
packages/twenty-server/src/engine/modules/auth/services/sign-up.service.ts
View File

@ -20,7 +20,7 @@ import {
import { User } from 'src/engine/modules/user/user.entity';
import { Workspace } from 'src/engine/modules/workspace/workspace.entity';
import { FileUploadService } from 'src/engine/modules/file/services/file-upload.service';
import { EnvironmentService } from 'src/integrations/environment/environment.service';
import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
import { getImageBufferFromUrl } from 'src/utils/image';
import { UserWorkspaceService } from 'src/engine/modules/user-workspace/user-workspace.service';

4
packages/twenty-server/src/engine/modules/auth/services/token.service.spec.ts
View File

@ -2,11 +2,11 @@ import { Test, TestingModule } from '@nestjs/testing';
import { JwtService } from '@nestjs/jwt';
import { getRepositoryToken } from '@nestjs/typeorm';
import { EnvironmentService } from 'src/integrations/environment/environment.service';
import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
import { RefreshToken } from 'src/engine/modules/refresh-token/refresh-token.entity';
import { User } from 'src/engine/modules/user/user.entity';
import { JwtAuthStrategy } from 'src/engine/modules/auth/strategies/jwt.auth.strategy';
import { EmailService } from 'src/integrations/email/email.service';
import { EmailService } from 'src/engine/integrations/email/email.service';
import { UserWorkspaceService } from 'src/engine/modules/user-workspace/user-workspace.service';
import { Workspace } from 'src/engine/modules/workspace/workspace.entity';

4
packages/twenty-server/src/engine/modules/auth/services/token.service.ts
View File

@ -32,11 +32,11 @@ import {
AuthTokens,
PasswordResetToken,
} from 'src/engine/modules/auth/dto/token.entity';
import { EnvironmentService } from 'src/integrations/environment/environment.service';
import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
import { User } from 'src/engine/modules/user/user.entity';
import { RefreshToken } from 'src/engine/modules/refresh-token/refresh-token.entity';
import { ValidatePasswordResetToken } from 'src/engine/modules/auth/dto/validate-password-reset-token.entity';
import { EmailService } from 'src/integrations/email/email.service';
import { EmailService } from 'src/engine/integrations/email/email.service';
import { InvalidatePassword } from 'src/engine/modules/auth/dto/invalidate-password.entity';
import { EmailPasswordResetLink } from 'src/engine/modules/auth/dto/email-password-reset-link.entity';
import { JwtData } from 'src/engine/modules/auth/types/jwt-data.type';

2
packages/twenty-server/src/engine/modules/auth/strategies/google-apis.auth.strategy.ts
View File

@ -4,7 +4,7 @@ import { Injectable } from '@nestjs/common';
import { Strategy, VerifyCallback } from 'passport-google-oauth20';
import { Request } from 'express';
import { EnvironmentService } from 'src/integrations/environment/environment.service';
import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
export type GoogleAPIsRequest = Request & {
user: {

2
packages/twenty-server/src/engine/modules/auth/strategies/google.auth.strategy.ts
View File

@ -4,7 +4,7 @@ import { Injectable } from '@nestjs/common';
import { Strategy, VerifyCallback } from 'passport-google-oauth20';
import { Request } from 'express';
import { EnvironmentService } from 'src/integrations/environment/environment.service';
import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
export type GoogleRequest = Request & {
user: {

2
packages/twenty-server/src/engine/modules/auth/strategies/jwt.auth.strategy.ts
View File

@ -10,7 +10,7 @@ import { Strategy, ExtractJwt } from 'passport-jwt';
import { Repository } from 'typeorm';
import { assert } from 'src/utils/assert';
import { EnvironmentService } from 'src/integrations/environment/environment.service';
import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
import { Workspace } from 'src/engine/modules/workspace/workspace.entity';
import { User } from 'src/engine/modules/user/user.entity';
import { TypeORMService } from 'src/database/typeorm/typeorm.service';