Skip to content

Commit

Permalink
fix(swc): change path to relative
Browse files Browse the repository at this point in the history
  • Loading branch information
Shchepotin committed Mar 24, 2024
1 parent 3110e44 commit 0e80661
Show file tree
Hide file tree
Showing 82 changed files with 232 additions and 189 deletions.
2 changes: 1 addition & 1 deletion .hygen/seeds/create-document/module.ejs.t
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ to: src/database/seeds/document/<%= h.inflection.transform(name, ['underscore',
---
import { Module } from '@nestjs/common';
import { MongooseModule } from '@nestjs/mongoose';
import { <%= name %>Schema, <%= name %>SchemaClass } from 'src/<%= h.inflection.transform(name, ['pluralize', 'underscore', 'dasherize']) %>/infrastructure/persistence/document/entities/<%= h.inflection.transform(name, ['underscore', 'dasherize']) %>.schema';
import { <%= name %>Schema, <%= name %>SchemaClass } from '../../../../<%= h.inflection.transform(name, ['pluralize', 'underscore', 'dasherize']) %>/infrastructure/persistence/document/entities/<%= h.inflection.transform(name, ['underscore', 'dasherize']) %>.schema';
import { <%= name %>SeedService } from './<%= h.inflection.transform(name, ['underscore', 'dasherize']) %>-seed.service';

@Module({
Expand Down
2 changes: 1 addition & 1 deletion .hygen/seeds/create-document/service.ejs.t
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ to: src/database/seeds/document/<%= h.inflection.transform(name, ['underscore',
import { Injectable } from '@nestjs/common';
import { InjectModel } from '@nestjs/mongoose';
import { Model } from 'mongoose';
import { <%= name %>SchemaClass } from 'src/<%= h.inflection.transform(name, ['pluralize', 'underscore', 'dasherize']) %>/infrastructure/persistence/document/entities/<%= h.inflection.transform(name, ['underscore', 'dasherize']) %>.schema';
import { <%= name %>SchemaClass } from '../../../../<%= h.inflection.transform(name, ['pluralize', 'underscore', 'dasherize']) %>/infrastructure/persistence/document/entities/<%= h.inflection.transform(name, ['underscore', 'dasherize']) %>.schema';

@Injectable()
export class <%= name %>SeedService {
Expand Down
2 changes: 1 addition & 1 deletion .hygen/seeds/create-relational/module.ejs.t
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ to: src/database/seeds/relational/<%= h.inflection.transform(name, ['underscore'
---
import { Module } from '@nestjs/common';
import { TypeOrmModule } from '@nestjs/typeorm';
import { <%= name %>Entity } from 'src/<%= h.inflection.transform(name, ['pluralize', 'underscore', 'dasherize']) %>/infrastructure/persistence/relational/entities/<%= h.inflection.transform(name, ['underscore', 'dasherize']) %>.entity';
import { <%= name %>Entity } from '../../../../<%= h.inflection.transform(name, ['pluralize', 'underscore', 'dasherize']) %>/infrastructure/persistence/relational/entities/<%= h.inflection.transform(name, ['underscore', 'dasherize']) %>.entity';
import { <%= name %>SeedService } from './<%= h.inflection.transform(name, ['underscore', 'dasherize']) %>-seed.service';

@Module({
Expand Down
2 changes: 1 addition & 1 deletion .hygen/seeds/create-relational/service.ejs.t
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ to: src/database/seeds/relational/<%= h.inflection.transform(name, ['underscore'
---
import { Injectable } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm';
import { <%= name %>Entity } from 'src/<%= h.inflection.transform(name, ['pluralize', 'underscore', 'dasherize']) %>/infrastructure/persistence/relational/entities/<%= h.inflection.transform(name, ['underscore', 'dasherize']) %>.entity';
import { <%= name %>Entity } from '../../../../<%= h.inflection.transform(name, ['pluralize', 'underscore', 'dasherize']) %>/infrastructure/persistence/relational/entities/<%= h.inflection.transform(name, ['underscore', 'dasherize']) %>.entity';
import { Repository } from 'typeorm';

@Injectable()
Expand Down
3 changes: 2 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"markdown.extension.toc.levels": "2..6",
"markdown.extension.orderedList.autoRenumber": false
"markdown.extension.orderedList.autoRenumber": false,
"typescript.preferences.importModuleSpecifier": "relative"
}
40 changes: 21 additions & 19 deletions docs/database.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
// /src/posts/infrastructure/persistence/relational/entities/post.entity.ts

import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
import { EntityRelationalHelper } from 'src/utils/relational-entity-helper';
import { EntityRelationalHelper } from '../../../../../utils/relational-entity-helper';

@Entity()
export class Post extends EntityRelationalHelper {
Expand Down Expand Up @@ -140,28 +140,28 @@ npm run seed:run:relational
npm i --save-dev @faker-js/faker
```

1. Create `src/database/seeds/user/user.factory.ts`:
1. Create `src/database/seeds/relational/user/user.factory.ts`:

```ts
import { faker } from '@faker-js/faker';
import { RoleEnum } from 'src/roles/roles.enum';
import { StatusEnum } from 'src/statuses/statuses.enum';
import { RoleEnum } from '../../../../roles/roles.enum';
import { StatusEnum } from '../../../../statuses/statuses.enum';
import { Injectable } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm';
import { Role } from 'src/roles/infrastructure/persistence/relational/entities/role.entity';
import { Status } from 'src/statuses/infrastructure/persistence/relational/entities/status.entity';
import { User } from 'src/users/infrastructure/persistence/relational/entities/user.entity';
import { RoleEntity } from '../../../../roles/infrastructure/persistence/relational/entities/role.entity';
import { UserEntity } from '../../../../users/infrastructure/persistence/relational/entities/user.entity';
import { StatusEntity } from '../../../../statuses/infrastructure/persistence/relational/entities/status.entity';
@Injectable()
export class UserFactory {
constructor(
@InjectRepository(User)
private repositoryUser: Repository<User>,
@InjectRepository(Role)
private repositoryRole: Repository<Role>,
@InjectRepository(Status)
private repositoryStatus: Repository<Status>,
@InjectRepository(UserEntity)
private repositoryUser: Repository<UserEntity>,
@InjectRepository(RoleEntity)
private repositoryRole: Repository<RoleEntity>,
@InjectRepository(StatusEntity)
private repositoryStatus: Repository<StatusEntity>,
) {}
createRandomUser() {
Expand All @@ -186,7 +186,7 @@ npm run seed:run:relational
}
```
1. Make changes in `src/database/seeds/user/user-seed.service.ts`:
1. Make changes in `src/database/seeds/relational/user/user-seed.service.ts`:
```ts
// Some code here...
Expand All @@ -212,19 +212,21 @@ npm run seed:run:relational
}
```
1. Make changes in `src/database/seeds/user/user-seed.module.ts`:
1. Make changes in `src/database/seeds/relational/user/user-seed.module.ts`:
```ts
import { Module } from '@nestjs/common';
import { TypeOrmModule } from '@nestjs/typeorm';
import { User } from 'src/users/entities/user.entity';
import { UserSeedService } from './user-seed.service';
import { UserFactory } from './user.factory';
import { Role } from 'src/roles/infrastructure/persistence/relational/entities/role.entity';
import { Status } from 'src/statuses/infrastructure/persistence/relational/entities/status.entity';
import { UserEntity } from '../../../../users/infrastructure/persistence/relational/entities/user.entity';
import { RoleEntity } from '../../../../roles/infrastructure/persistence/relational/entities/role.entity';
import { StatusEntity } from '../../../../statuses/infrastructure/persistence/relational/entities/status.entity';
@Module({
imports: [TypeOrmModule.forFeature([User, Role, Status])],
imports: [TypeOrmModule.forFeature([UserEntity, Role, Status])],
providers: [UserSeedService, UserFactory],
exports: [UserSeedService, UserFactory],
})
Expand Down
2 changes: 1 addition & 1 deletion src/auth-apple/auth-apple.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import appleSigninAuth from 'apple-signin-auth';
import { ConfigService } from '@nestjs/config';
import { SocialInterface } from '../social/interfaces/social.interface';
import { AuthAppleLoginDto } from './dto/auth-apple-login.dto';
import { AllConfigType } from 'src/config/config.type';
import { AllConfigType } from '../config/config.type';

@Injectable()
export class AuthAppleService {
Expand Down
3 changes: 2 additions & 1 deletion src/auth-apple/config/apple.config.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import { registerAs } from '@nestjs/config';
import { AppleConfig } from 'src/auth-apple/config/apple-config.type';

import { IsJSON, IsOptional } from 'class-validator';
import validateConfig from '../../utils/validate-config';
import { AppleConfig } from './apple-config.type';

class EnvironmentVariablesValidator {
@IsJSON()
Expand Down
2 changes: 1 addition & 1 deletion src/auth-facebook/auth-facebook.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { ConfigService } from '@nestjs/config';
import { SocialInterface } from '../social/interfaces/social.interface';
import { FacebookInterface } from './interfaces/facebook.interface';
import { AuthFacebookLoginDto } from './dto/auth-facebook-login.dto';
import { AllConfigType } from 'src/config/config.type';
import { AllConfigType } from '../config/config.type';

@Injectable()
export class AuthFacebookService {
Expand Down
3 changes: 2 additions & 1 deletion src/auth-facebook/config/facebook.config.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import { registerAs } from '@nestjs/config';
import { FacebookConfig } from 'src/auth-facebook/config/facebook-config.type';

import { IsOptional, IsString } from 'class-validator';
import validateConfig from '../../utils/validate-config';
import { FacebookConfig } from './facebook-config.type';

class EnvironmentVariablesValidator {
@IsString()
Expand Down
2 changes: 1 addition & 1 deletion src/auth-google/auth-google.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { ConfigService } from '@nestjs/config';
import { OAuth2Client } from 'google-auth-library';
import { SocialInterface } from '../social/interfaces/social.interface';
import { AuthGoogleLoginDto } from './dto/auth-google-login.dto';
import { AllConfigType } from 'src/config/config.type';
import { AllConfigType } from '../config/config.type';

@Injectable()
export class AuthGoogleService {
Expand Down
3 changes: 2 additions & 1 deletion src/auth-google/config/google.config.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import { registerAs } from '@nestjs/config';
import { GoogleConfig } from 'src/auth-google/config/google-config.type';

import { IsOptional, IsString } from 'class-validator';
import validateConfig from '../../utils/validate-config';
import { GoogleConfig } from './google-config.type';

class EnvironmentVariablesValidator {
@IsString()
Expand Down
2 changes: 1 addition & 1 deletion src/auth-twitter/auth-twitter.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { ConfigService } from '@nestjs/config';
import Twitter from 'twitter';
import { SocialInterface } from '../social/interfaces/social.interface';
import { AuthTwitterLoginDto } from './dto/auth-twitter-login.dto';
import { AllConfigType } from 'src/config/config.type';
import { AllConfigType } from '../config/config.type';

@Injectable()
export class AuthTwitterService {
Expand Down
2 changes: 1 addition & 1 deletion src/auth/auth.controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import { AuthGuard } from '@nestjs/passport';
import { AuthRegisterLoginDto } from './dto/auth-register-login.dto';
import { LoginResponseType } from './types/login-response.type';
import { NullableType } from '../utils/types/nullable.type';
import { User } from 'src/users/domain/user';
import { User } from '../users/domain/user';

@ApiTags('Auth')
@Controller({
Expand Down
6 changes: 3 additions & 3 deletions src/auth/auth.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import { PassportModule } from '@nestjs/passport';
import { JwtModule } from '@nestjs/jwt';
import { JwtStrategy } from './strategies/jwt.strategy';
import { AnonymousStrategy } from './strategies/anonymous.strategy';
import { UsersModule } from 'src/users/users.module';
import { MailModule } from 'src/mail/mail.module';
import { SessionModule } from 'src/session/session.module';
import { JwtRefreshStrategy } from './strategies/jwt-refresh.strategy';
import { MailModule } from '../mail/mail.module';
import { SessionModule } from '../session/session.module';
import { UsersModule } from '../users/users.module';

@Module({
imports: [
Expand Down
16 changes: 8 additions & 8 deletions src/auth/auth.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,22 +11,22 @@ import { JwtService } from '@nestjs/jwt';
import bcrypt from 'bcryptjs';
import { AuthEmailLoginDto } from './dto/auth-email-login.dto';
import { AuthUpdateDto } from './dto/auth-update.dto';
import { RoleEnum } from 'src/roles/roles.enum';
import { StatusEnum } from 'src/statuses/statuses.enum';
import { AuthProvidersEnum } from './auth-providers.enum';
import { SocialInterface } from '../social/interfaces/social.interface';
import { AuthRegisterLoginDto } from './dto/auth-register-login.dto';
import { MailService } from 'src/mail/mail.service';
import { NullableType } from '../utils/types/nullable.type';
import { LoginResponseType } from './types/login-response.type';
import { ConfigService } from '@nestjs/config';
import { AllConfigType } from 'src/config/config.type';
import { JwtRefreshPayloadType } from './strategies/types/jwt-refresh-payload.type';
import { JwtPayloadType } from './strategies/types/jwt-payload.type';
import { User } from 'src/users/domain/user';
import { Session } from 'src/session/domain/session';
import { UsersService } from 'src/users/users.service';
import { SessionService } from 'src/session/session.service';
import { UsersService } from '../users/users.service';
import { AllConfigType } from '../config/config.type';
import { MailService } from '../mail/mail.service';
import { RoleEnum } from '../roles/roles.enum';
import { Session } from '../session/domain/session';
import { SessionService } from '../session/session.service';
import { StatusEnum } from '../statuses/statuses.enum';
import { User } from '../users/domain/user';

@Injectable()
export class AuthService {
Expand Down
3 changes: 2 additions & 1 deletion src/auth/config/auth.config.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import { registerAs } from '@nestjs/config';
import { AuthConfig } from 'src/auth/config/auth-config.type';

import { IsString } from 'class-validator';
import validateConfig from '../../utils/validate-config';
import { AuthConfig } from './auth-config.type';

class EnvironmentVariablesValidator {
@IsString()
Expand Down
2 changes: 1 addition & 1 deletion src/auth/dto/auth-update.dto.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { ApiPropertyOptional } from '@nestjs/swagger';
import { IsNotEmpty, IsOptional, MinLength } from 'class-validator';
import { FileDto } from 'src/files/dto/file.dto';
import { FileDto } from '../../files/dto/file.dto';

export class AuthUpdateDto {
@ApiPropertyOptional({ type: () => FileDto })
Expand Down
2 changes: 1 addition & 1 deletion src/auth/strategies/jwt-refresh.strategy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { PassportStrategy } from '@nestjs/passport';
import { ConfigService } from '@nestjs/config';
import { JwtRefreshPayloadType } from './types/jwt-refresh-payload.type';
import { OrNeverType } from '../../utils/types/or-never.type';
import { AllConfigType } from 'src/config/config.type';
import { AllConfigType } from '../../config/config.type';

@Injectable()
export class JwtRefreshStrategy extends PassportStrategy(
Expand Down
2 changes: 1 addition & 1 deletion src/auth/strategies/jwt.strategy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import { Injectable, UnauthorizedException } from '@nestjs/common';
import { PassportStrategy } from '@nestjs/passport';
import { ConfigService } from '@nestjs/config';
import { OrNeverType } from '../../utils/types/or-never.type';
import { AllConfigType } from 'src/config/config.type';
import { JwtPayloadType } from './types/jwt-payload.type';
import { AllConfigType } from '../../config/config.type';

@Injectable()
export class JwtStrategy extends PassportStrategy(Strategy, 'jwt') {
Expand Down
4 changes: 2 additions & 2 deletions src/auth/strategies/types/jwt-payload.type.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Session } from 'src/session/domain/session';
import { User } from 'src/users/domain/user';
import { Session } from '../../../session/domain/session';
import { User } from '../../../users/domain/user';

export type JwtPayloadType = Pick<User, 'id' | 'role'> & {
sessionId: Session['id'];
Expand Down
2 changes: 1 addition & 1 deletion src/auth/strategies/types/jwt-refresh-payload.type.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Session } from 'src/session/domain/session';
import { Session } from '../../../session/domain/session';

export type JwtRefreshPayloadType = {
sessionId: Session['id'];
Expand Down
2 changes: 1 addition & 1 deletion src/auth/types/login-response.type.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { User } from 'src/users/domain/user';
import { User } from '../../users/domain/user';

export type LoginResponseType = Readonly<{
token: string;
Expand Down
3 changes: 2 additions & 1 deletion src/database/config/database.config.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { registerAs } from '@nestjs/config';
import { DatabaseConfig } from 'src/database/config/database-config.type';

import {
IsOptional,
IsInt,
Expand All @@ -10,6 +10,7 @@ import {
IsBoolean,
} from 'class-validator';
import validateConfig from '../../utils/validate-config';
import { DatabaseConfig } from './database-config.type';

class EnvironmentVariablesValidator {
@ValidateIf((envValues) => envValues.DATABASE_URL)
Expand Down
2 changes: 1 addition & 1 deletion src/database/data-source.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export const AppDataSource = new DataSource({
migrations: [__dirname + '/migrations/**/*{.ts,.js}'],
cli: {
entitiesDir: 'src',
migrationsDir: 'src/database/migrations',

subscribersDir: 'subscriber',
},
extra: {
Expand Down
2 changes: 1 addition & 1 deletion src/database/mongoose-config.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {
MongooseModuleOptions,
MongooseOptionsFactory,
} from '@nestjs/mongoose';
import { AllConfigType } from 'src/config/config.type';
import { AllConfigType } from '../config/config.type';

@Injectable()
export class MongooseConfigService implements MongooseOptionsFactory {
Expand Down
8 changes: 5 additions & 3 deletions src/database/seeds/document/seed.module.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
import { Module } from '@nestjs/common';
import { ConfigModule } from '@nestjs/config';
import appConfig from 'src/config/app.config';
import databaseConfig from 'src/database/config/database.config';

import { MongooseModule } from '@nestjs/mongoose';
import { MongooseConfigService } from 'src/database/mongoose-config.service';

import { UserSeedModule } from './user/user-seed.module';
import appConfig from '../../../config/app.config';
import databaseConfig from '../../config/database.config';
import { MongooseConfigService } from '../../mongoose-config.service';

@Module({
imports: [
Expand Down
6 changes: 3 additions & 3 deletions src/database/seeds/document/user/user-seed.module.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { Module } from '@nestjs/common';
import { MongooseModule } from '@nestjs/mongoose';
import { UserSeedService } from './user-seed.service';
import {
UserSchema,
UserSchemaClass,
} from 'src/users/infrastructure/persistence/document/entities/user.schema';
import { UserSeedService } from './user-seed.service';
UserSchema,
} from '../../../../users/infrastructure/persistence/document/entities/user.schema';

@Module({
imports: [
Expand Down
6 changes: 3 additions & 3 deletions src/database/seeds/document/user/user-seed.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ import { Injectable } from '@nestjs/common';
import { InjectModel } from '@nestjs/mongoose';
import bcrypt from 'bcryptjs';
import { Model } from 'mongoose';
import { RoleEnum } from 'src/roles/roles.enum';
import { StatusEnum } from 'src/statuses/statuses.enum';
import { UserSchemaClass } from 'src/users/infrastructure/persistence/document/entities/user.schema';
import { RoleEnum } from '../../../../roles/roles.enum';
import { StatusEnum } from '../../../../statuses/statuses.enum';
import { UserSchemaClass } from '../../../../users/infrastructure/persistence/document/entities/user.schema';

@Injectable()
export class UserSeedService {
Expand Down
3 changes: 2 additions & 1 deletion src/database/seeds/relational/role/role-seed.module.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import { Module } from '@nestjs/common';
import { TypeOrmModule } from '@nestjs/typeorm';
import { RoleEntity } from 'src/roles/infrastructure/persistence/relational/entities/role.entity';

import { RoleSeedService } from './role-seed.service';
import { RoleEntity } from '../../../../roles/infrastructure/persistence/relational/entities/role.entity';

@Module({
imports: [TypeOrmModule.forFeature([RoleEntity])],
Expand Down
Loading

0 comments on commit 0e80661

Please sign in to comment.