Skip to content

Commit dd54eb0

Browse files
committed
fix: ajustes finais
1 parent 13a8992 commit dd54eb0

20 files changed

+419
-269
lines changed

package-lock.json

Lines changed: 125 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,18 @@
1919
"test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand",
2020
"test:e2e": "jest --config ./test/jest-e2e.json",
2121
"test:ci": "jest --ci --coverage --reporters=default --reporters=jest-junit",
22-
"typeorm": "ts-node -r dotenv/config ./node_modules/typeorm/cli.js",
23-
"migration:generate": "npm run typeorm -- migration:generate -d src/db/config.ts",
24-
"migration:run": "npm run typeorm -- migration:run -d src/db/config.ts",
25-
"migration:revert": "npm run typeorm -- migration:revert -d src/db/config.ts"
22+
"typeorm": "ts-node -r tsconfig-paths/register ./node_modules/typeorm/cli.js --dataSource src/db/config.ts",
23+
"migration:run": "npm run typeorm migration:run",
24+
"migration:revert": "npm run typeorm migration:revert",
25+
"migration:generate": "npm run typeorm migration:generate -- -n",
26+
"migration:create": "npm run typeorm migration:create -- -n"
2627
},
2728
"dependencies": {
2829
"@nestjs/common": "^11.0.1",
2930
"@nestjs/core": "^11.0.1",
3031
"@nestjs/platform-express": "^11.0.1",
3132
"dotenv": "^16.5.0",
33+
"pg": "^8.14.1",
3234
"reflect-metadata": "^0.2.2",
3335
"rxjs": "^7.8.1",
3436
"typeorm": "^0.3.22"

src/db/config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import 'reflect-metadata';
22
import { DataSource } from 'typeorm';
33
import * as dotenv from 'dotenv';
44

5-
dotenv.config();
5+
dotenv.config();
66

77
export const AppDataSource = new DataSource({
88
type: 'postgres',

src/entities/aluno/aluno.entity.ts

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -6,36 +6,36 @@ import { UnidadeEnum } from 'src/enum/enumCampus';
66

77
@Entity()
88
export class Aluno {
9-
@PrimaryGeneratedColumn()
10-
aluno_id: number;
9+
@PrimaryGeneratedColumn()
10+
aluno_id: number;
1111

12-
@Column()
13-
id_clerk: number;
12+
@Column()
13+
id_clerk: number;
1414

15-
@Column({ type: 'enum', enum: PronomesEnum })
16-
pronome: PronomesEnum;
15+
@Column({ type: 'enum', enum: PronomesEnum })
16+
pronome: PronomesEnum;
1717

18-
@Column({ type: 'date' })
19-
data_nascimento: Date;
18+
@Column({ type: 'date' })
19+
data_nascimento: Date;
2020

21-
@Column({ type: 'enum', enum: CursosEnum })
22-
curso: CursosEnum;
21+
@Column({ type: 'enum', enum: CursosEnum })
22+
curso: CursosEnum;
2323

24-
@Column({ type: 'enum', enum: UnidadeEnum })
25-
campus: UnidadeEnum;
24+
@Column({ type: 'enum', enum: UnidadeEnum })
25+
campus: UnidadeEnum;
2626

27-
@Column()
28-
cpf: string;
27+
@Column()
28+
cpf: string;
2929

30-
@Column({ type: 'date' })
31-
data_ingresso: Date;
30+
@Column({ type: 'date' })
31+
data_ingresso: Date;
3232

33-
@Column()
34-
identidade: string;
33+
@Column()
34+
identidade: string;
3535

36-
@Column()
37-
celular: string;
36+
@Column()
37+
celular: string;
3838

39-
@OneToMany(() => Inscricao, (inscricao) => inscricao.edital)
40-
inscricoes: Inscricao[];
41-
}
39+
@OneToMany(() => Inscricao, (inscricao) => inscricao.edital)
40+
inscricoes: Inscricao[];
41+
}

src/entities/documento/documento.entity.ts

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,19 @@ import { EnumTipoDocumento } from 'src/enum/enumTipoDocumento';
44
import { StatusDocumento } from 'src/enum/statusDocumento';
55

66
@Entity()
7-
87
export class Documento {
9-
@PrimaryGeneratedColumn()
10-
documento_id: number;
8+
@PrimaryGeneratedColumn()
9+
documento_id: number;
1110

12-
@ManyToOne(() => Inscricao, (inscricao) => inscricao.documentos)
13-
inscricao: Inscricao;
11+
@ManyToOne(() => Inscricao, (inscricao) => inscricao.documentos)
12+
inscricao: Inscricao;
1413

15-
@Column({ type: 'enum', enum: EnumTipoDocumento })
16-
tipo_documento: EnumTipoDocumento;
14+
@Column({ type: 'enum', enum: EnumTipoDocumento })
15+
tipo_documento: EnumTipoDocumento;
1716

18-
@Column()
19-
documento_url: string;
17+
@Column()
18+
documento_url: string;
2019

21-
@Column({ type: 'enum', enum: StatusDocumento })
22-
status_documento: StatusDocumento;
23-
}
20+
@Column({ type: 'enum', enum: StatusDocumento })
21+
status_documento: StatusDocumento;
22+
}

src/entities/edital/edital.entity.ts

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,31 +6,30 @@ import { StatusEdital } from 'src/enum/enumStatusEdital';
66

77
@Entity()
88
export class Edital {
9-
@PrimaryGeneratedColumn()
10-
beneficio_id: number;
9+
@PrimaryGeneratedColumn()
10+
beneficio_id: number;
1111

12-
@Column({ type: 'enum', enum: EditalEnum })
13-
tipo_beneficio: EditalEnum;
12+
@Column({ type: 'enum', enum: EditalEnum })
13+
tipo_beneficio: EditalEnum;
1414

15-
@Column({ type: 'text' })
16-
descricao: string
15+
@Column({ type: 'text' })
16+
descricao: string;
1717

18-
@Column()
19-
edital_url: string
18+
@Column()
19+
edital_url: string;
2020

21-
@Column({ type: 'date' })
22-
data_inicio: Date;
21+
@Column({ type: 'date' })
22+
data_inicio: Date;
2323

24-
@Column({ type: 'date' })
25-
data_fim: Date;
24+
@Column({ type: 'date' })
25+
data_fim: Date;
2626

27-
@Column({ type: 'enum', enum: StatusEdital })
28-
status_edital: StatusEdital;
27+
@Column({ type: 'enum', enum: StatusEdital })
28+
status_edital: StatusEdital;
2929

30-
@OneToMany(() => Inscricao, (inscricao) => inscricao.edital)
31-
inscricoes: Inscricao[];
30+
@OneToMany(() => Inscricao, (inscricao) => inscricao.edital)
31+
inscricoes: Inscricao[];
3232

33-
@OneToMany(() => EtapaInscricao, (etapa) => etapa.edital)
34-
etapas: EtapaInscricao[];
35-
36-
}
33+
@OneToMany(() => EtapaInscricao, (etapa) => etapa.edital)
34+
etapas: EtapaInscricao[];
35+
}
Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,30 @@
1-
import { Entity, PrimaryGeneratedColumn, Column, ManyToOne, OneToMany } from 'typeorm';
1+
import {
2+
Entity,
3+
PrimaryGeneratedColumn,
4+
Column,
5+
ManyToOne,
6+
OneToMany,
7+
} from 'typeorm';
28
import { Edital } from '../edital/edital.entity';
39
import { ResultadoEtapa } from '../resultadoEtapa/resultadoEtapa.entity';
410

511
@Entity()
612
export class EtapaInscricao {
7-
@PrimaryGeneratedColumn()
8-
etapa_id: number;
13+
@PrimaryGeneratedColumn()
14+
etapa_id: number;
915

10-
@ManyToOne(() => Edital, (edital) => edital.etapas)
11-
edital: Edital;
16+
@ManyToOne(() => Edital, (edital) => edital.etapas)
17+
edital: Edital;
1218

13-
@Column()
14-
nome_etapa: string;
19+
@Column()
20+
nome_etapa: string;
1521

16-
@Column()
17-
ordem_etapa: number;
22+
@Column()
23+
ordem_etapa: number;
1824

19-
@Column({ type: 'text' })
20-
descricao_etapa: string;
25+
@Column({ type: 'text' })
26+
descricao_etapa: string;
2127

22-
@OneToMany(() => ResultadoEtapa, (resultado) => resultado.etapa)
23-
resultados: ResultadoEtapa[];
24-
}
28+
@OneToMany(() => ResultadoEtapa, (resultado) => resultado.etapa)
29+
resultados: ResultadoEtapa[];
30+
}

0 commit comments

Comments
 (0)