Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/info #4

Merged
merged 3 commits into from
Jun 26, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import { MailModule } from './mail/mail.module';
import { HomeModule } from './home/home.module';
import { DataSource, DataSourceOptions } from 'typeorm';
import { AllConfigType } from './config/config.type';
import { InfoModule } from './info/info.module';

@Module({
imports: [
Expand Down Expand Up @@ -84,6 +85,7 @@ import { AllConfigType } from './config/config.type';
ForgotModule,
MailModule,
HomeModule,
InfoModule,
],
})
export class AppModule {}
15 changes: 15 additions & 0 deletions src/database/migrations/1687403553617-CreateInfo.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import { MigrationInterface, QueryRunner } from 'typeorm';

export class CreateInfo1687403553617 implements MigrationInterface {
name = 'CreateInfo1687403553617';

public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(
`CREATE TABLE "info" ("id" integer NOT NULL, "name" character varying NOT NULL, "value" character varying NOT NULL, CONSTRAINT "UQ_916df6cf672c24f99ceab946a88" UNIQUE ("name"), CONSTRAINT "PK_687dc5e25f4f1ee093a45b68bb7" PRIMARY KEY ("id"))`,
);
}

public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`DROP TABLE "info"`);
}
}
15 changes: 15 additions & 0 deletions src/database/migrations/1687533339069-ColumnInfoVersion.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import { MigrationInterface, QueryRunner } from 'typeorm';

export class ColumnInfoVersion1687533339069 implements MigrationInterface {
name = 'ColumnInfoVersion1687533339069';

public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(
`ALTER TABLE "info" ADD "version" character varying`,
);
}

public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE "info" DROP COLUMN "version"`);
}
}
10 changes: 10 additions & 0 deletions src/database/seeds/info/info-data.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import { InfoData } from 'src/info/info-data.interface';

export const infoData: InfoData[] = [
// settings for any api version
{ name: 'maintenance', value: 'false' },

// v1
{ name: 'abTestEnabled', value: 'false', version: '1' },
{ name: 'maxUploadSize', value: '10MB', version: '1' },
];
11 changes: 11 additions & 0 deletions src/database/seeds/info/info-seed.module.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import { Module } from '@nestjs/common';
import { TypeOrmModule } from '@nestjs/typeorm';
import { InfoSeedService } from './info-seed.service';
import { Info } from 'src/info/entities/info.entity';

@Module({
imports: [TypeOrmModule.forFeature([Info])],
providers: [InfoSeedService],
exports: [InfoSeedService],
})
export class InfoSeedModule {}
37 changes: 37 additions & 0 deletions src/database/seeds/info/info-seed.service.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
import { Injectable } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm';
import { Info } from 'src/info/entities/info.entity';
import { Repository } from 'typeorm';
import { infoData } from './info-data';

@Injectable()
export class InfoSeedService {
constructor(
@InjectRepository(Info)
private repository: Repository<Info>,
) {}

async run() {
let id = 1;
for (const item of infoData) {
const count = await this.repository.count({
where: {
name: item.name,
version: item.version,
},
});

if (!count) {
await this.repository.save(
this.repository.create({
id: id,
name: item.name,
value: item.value,
version: item.version,
}),
);
}
id++;
}
}
}
2 changes: 2 additions & 0 deletions src/database/seeds/run-seed.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { RoleSeedService } from './role/role-seed.service';
import { SeedModule } from './seed.module';
import { StatusSeedService } from './status/status-seed.service';
import { UserSeedService } from './user/user-seed.service';
import { InfoSeedService } from './info/info-seed.service';

const runSeed = async () => {
const app = await NestFactory.create(SeedModule);
Expand All @@ -11,6 +12,7 @@ const runSeed = async () => {
await app.get(RoleSeedService).run();
await app.get(StatusSeedService).run();
await app.get(UserSeedService).run();
await app.get(InfoSeedService).run();

await app.close();
};
Expand Down
2 changes: 2 additions & 0 deletions src/database/seeds/seed.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,14 @@ import { TypeOrmConfigService } from '../typeorm-config.service';
import { RoleSeedModule } from './role/role-seed.module';
import { StatusSeedModule } from './status/status-seed.module';
import { UserSeedModule } from './user/user-seed.module';
import { InfoSeedModule } from './info/info-seed.module';

@Module({
imports: [
RoleSeedModule,
StatusSeedModule,
UserSeedModule,
InfoSeedModule,
ConfigModule.forRoot({
isGlobal: true,
load: [databaseConfig, appConfig],
Expand Down
23 changes: 23 additions & 0 deletions src/info/entities/info.entity.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import { BaseEntity, Column, Entity, PrimaryColumn } from 'typeorm';
import { ApiProperty } from '@nestjs/swagger';
import { Exclude } from 'class-transformer';

@Entity({ name: 'info' })
export class Info extends BaseEntity {
@Exclude()
@ApiProperty({ example: 1 })
@PrimaryColumn()
id: number;

@ApiProperty({ example: 'version' })
@Column({ unique: true })
name: string;

@ApiProperty({ example: '1' })
@Column()
value: string;

@ApiProperty({ example: '1' })
@Column({ nullable: true })
version: string;
}
6 changes: 6 additions & 0 deletions src/info/info-data.interface.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
// info-data.interface.ts
export interface InfoData {
name: string;
value: string;
version?: string;
}
18 changes: 18 additions & 0 deletions src/info/info.controller.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import { Test, TestingModule } from '@nestjs/testing';
import { InfoController } from './info.controller';

describe('InfoController', () => {
let controller: InfoController;

beforeEach(async () => {
const module: TestingModule = await Test.createTestingModule({
controllers: [InfoController],
}).compile();

controller = module.get<InfoController>(InfoController);
});

it('should be defined', () => {
expect(controller).toBeDefined();
});
});
24 changes: 24 additions & 0 deletions src/info/info.controller.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
import { Controller, Get, Param } from '@nestjs/common';
import { ApiTags, ApiParam } from '@nestjs/swagger';
import { InfoService } from './info.service';
import { Info } from './entities/info.entity';
import { NullableType } from 'src/utils/types/nullable.type';

@ApiTags('Info')
@Controller('info')
export class InfoController {
constructor(private readonly infoService: InfoService) {}

@Get()
async getAll(): Promise<NullableType<Info[]>> {
return this.infoService.find();
}

@Get('v:version')
@ApiParam({ name: 'version', example: '1' })
getByVersion(
@Param('version') version: string,
): Promise<NullableType<Info[]>> {
return this.infoService.findByVersion(version);
}
}
12 changes: 12 additions & 0 deletions src/info/info.module.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import { Module } from '@nestjs/common';
import { InfoController } from './info.controller';
import { InfoService } from './info.service';
import { TypeOrmModule } from '@nestjs/typeorm';
import { Info } from './entities/info.entity';

@Module({
imports: [TypeOrmModule.forFeature([Info])],
controllers: [InfoController],
providers: [InfoService],
})
export class InfoModule {}
18 changes: 18 additions & 0 deletions src/info/info.service.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import { Test, TestingModule } from '@nestjs/testing';
import { InfoService } from './info.service';

describe('InfoService', () => {
let service: InfoService;

beforeEach(async () => {
const module: TestingModule = await Test.createTestingModule({
providers: [InfoService],
}).compile();

service = module.get<InfoService>(InfoService);
});

it('should be defined', () => {
expect(service).toBeDefined();
});
});
36 changes: 36 additions & 0 deletions src/info/info.service.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
import { Injectable } from '@nestjs/common';
import { IsNull, Repository } from 'typeorm';
import { Info } from './entities/info.entity';
import { InjectRepository } from '@nestjs/typeorm';
import { EntityCondition } from 'src/utils/types/entity-condition.type';
import { NullableType } from 'src/utils/types/nullable.type';

@Injectable()
export class InfoService {
constructor(
@InjectRepository(Info)
private readonly infoRepository: Repository<Info>,
) {}

async find(fields?: EntityCondition<Info>): Promise<NullableType<Info[]>> {
return this.infoRepository.find({
where: fields,
});
}

async findByVersion(version: string): Promise<Info[]> {
// If no version found, return empty to indicate it
const count = await this.infoRepository.count({
where: { version: version },
});

if (count === 0) {
return [];
}

// Otherwise, return settings for given version and for any version (null)
return this.infoRepository.find({
where: [{ version: version }, { version: IsNull() }],
});
}
}