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] - Registro Manual de Contadores de Impressão #36

Merged
merged 18 commits into from
Aug 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
a48960a
feature: adicionando rota para contadores de impressões
MatheussBrant Aug 6, 2024
3251765
config(docker): separando Dockerfile em ambientes
eliseukadesh67 Aug 7, 2024
f1ecdad
chore: modificando rota para atualizar contadores
eliseukadesh67 Aug 7, 2024
a465fdb
feat(contadores): modificando controller e repository para receber o …
eliseukadesh67 Aug 7, 2024
25a0ada
feat(contadores): adicionando validação para numero de contador negativo
eliseukadesh67 Aug 7, 2024
145d565
test(contadores): adicionando testes de controllers, repositories e v…
eliseukadesh67 Aug 7, 2024
1179bea
chore: modificando nome das funções e validators de add pra update
eliseukadesh67 Aug 7, 2024
687f8cb
feat: adiciona data da contagem manual ao model da impressora
eliseukadesh67 Aug 15, 2024
3513dc0
fix: adicionando validação do tipo do id antes das outras validações
eliseukadesh67 Aug 15, 2024
8719804
feat: adicionando validação do campo de data da contagem
eliseukadesh67 Aug 15, 2024
ee01c05
test: ajustando testes para nova validação do campo da data de contag…
eliseukadesh67 Aug 15, 2024
b673132
chore: renomeando campo de data do contador
eliseukadesh67 Aug 15, 2024
7c466a1
fix: lint e modificação do tratamento de erro de equipamento não enco…
eliseukadesh67 Aug 15, 2024
d6655a3
chore: renomeando coluna para data do contador
eliseukadesh67 Aug 15, 2024
97d7f3f
Merge branch 'dev' of github.com:fga-eps-mds/2024.1-PrintGo-PrinterSe…
eliseukadesh67 Aug 15, 2024
fe19eb8
fix: corrigindo migrations
eliseukadesh67 Aug 15, 2024
815ab39
config(devops): docker para dev e produção
eliseukadesh67 Aug 15, 2024
2cf7616
chore: removendo print desnecessario
eliseukadesh67 Aug 15, 2024
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
6 changes: 4 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@ services:
printer-api:
container_name: printer-api
restart: on-failure
build: .
build:
context: .
dockerfile: ./docker/Dockerfile.development
environment:
DATABASE_URL: ${DOCKER_URL}
NODE_ENV: development
Expand All @@ -19,7 +21,7 @@ services:
- printgo_network
depends_on:
- postgres-printgo
command: ["sh", "-c", "npx prisma db push && yarn start"]
command: ["sh", "-c", "npx prisma db push && yarn dev"]

postgres-printgo:
image: postgres:13
Expand Down
14 changes: 14 additions & 0 deletions docker/Dockerfile.development
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
FROM node:18

WORKDIR /src

ENV PORT=8001

COPY ./package.json .
RUN yarn install

COPY . .

EXPOSE $PORT

CMD [ "yarn", "dev" ]
3 changes: 1 addition & 2 deletions Dockerfile → docker/Dockerfile.production
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ COPY . .

EXPOSE $PORT

RUN npx prisma generate
RUN npx prisma db push
RUN yarn build

CMD [ "yarn", "start" ]
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
"test": "NODE_ENV=test jest --passWithNoTests --no-cache --runInBand",
"test:all": "CI=true npm run test -- --coverage",
"build": "tsc",
"start": "nodemon",
"dev": "nodemon",
"start": "node dist/server.js",
"lint": "eslint --ext .ts",
"lint:fix": "eslint --ext .ts --fix"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ CREATE TABLE "Impressora" (
"estaNaRede" BOOLEAN NOT NULL,
"dataInstalacao" TIMESTAMP(3) NOT NULL,
"dataRetirada" TIMESTAMP(3),
"dataContador" TIMESTAMP(3),
"ativo" BOOLEAN NOT NULL,
"contadorInstalacaoPB" INTEGER NOT NULL,
"contadorInstalacaoCor" INTEGER NOT NULL,
Expand Down
45 changes: 23 additions & 22 deletions prisma/schema.prisma
Original file line number Diff line number Diff line change
Expand Up @@ -34,32 +34,33 @@ model Padrao {
}

model Impressora {
id Int @id @default(autoincrement())
numContrato String
numSerie String @unique
enderecoIp String
estaNaRede Boolean
dataInstalacao DateTime
dataRetirada DateTime?
ativo Boolean
contadorInstalacaoPB Int
contadorInstalacaoCor Int
contadorAtualPB Int
contadorAtualCor Int
contadorRetiradaPB Int
contadorRetiradaCor Int
localizacao String
modeloId String
relatorio Relatorio?
relatorioLocadora RelatorioLocadora?
id Int @id @default(autoincrement())
numContrato String
numSerie String @unique
enderecoIp String
estaNaRede Boolean
dataInstalacao DateTime
dataRetirada DateTime?
dataContador DateTime?
ativo Boolean
contadorInstalacaoPB Int
contadorInstalacaoCor Int
contadorAtualPB Int
contadorAtualCor Int
contadorRetiradaPB Int
contadorRetiradaCor Int
localizacao String
modeloId String
relatorio Relatorio?
relatorioLocadora RelatorioLocadora?
}

model Relatorio {
id Int @id @default(autoincrement())
impressora Impressora @relation(fields: [impressoraId], references: [id])
impressoraId Int @unique
contadorPB Int
contadorPBDiff Int
contadorPB Int
contadorPBDiff Int
contadorCor Int
contadorCorDiff Int
ultimoResultado Int
Expand All @@ -71,7 +72,7 @@ model RelatorioLocadora {
id Int @id @default(autoincrement())
impressora Impressora @relation(fields: [impressoraId], references: [id])
impressoraId Int @unique
contadorPB Int
contadorPB Int
contadorCor Int
contadorTotal Int
contadorTotal Int
}
Loading
Loading