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.

Sign up for GitHub

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

Jump to bottom

release(main) #258

Merged
merged 206 commits into from
Jun 11, 2024
Merged

release(main) #258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
206 commits
Select commit Hold shift + click to select a range
56648f1
feat(RF32): Added Endpoint & Logic for 'Expense report by id'
Ian326 May 22, 2024
a88265b
fix(RF32): Added function 'Doxygen comments' in findExpensesByReportId
Ian326 May 22, 2024
b778cd8
feat(RF32): Added mocha&chai tests for expense service
Ian326 May 22, 2024
b1a27f6
fix(tests): fixed non working tests from develop
salgue441 May 22, 2024
b87c886
feat(homeService): added new throw NotFoundError when the role is not…
salgue441 May 22, 2024
39b524b
feat(homeServiceTest): added new modularity feature
salgue441 May 22, 2024
f92b58d
feat(homeServiceTest): added type checking for the employee task elem…
salgue441 May 22, 2024
4904fda
feat(homeServiceTest): added sinon assertions for the mocked function…
salgue441 May 22, 2024
acd7673
feat(homeServiceTest): added sinon assertions for the mocked function…
salgue441 May 22, 2024
86a33db
fix(homeServiceTest): added the naming of the variables according to …
salgue441 May 22, 2024
8a88984
feat(homeServiceTest): added chaiAsPromised to the test file as before
salgue441 May 22, 2024
7cbb004
fix(branch): fixed linter issues
salgue441 May 23, 2024
97a565d
Merge pull request #203 from Black-Dot-2024/fix/tests
Ian326 May 23, 2024
0a652a2
fix(merge): Pull from develop
Ian326 May 23, 2024
09b5c15
refactor(RF32): Modified request to db. Optimization
Ian326 May 23, 2024
77428a6
fix(RF32): Incorrect casing for 'totalAmount'
Ian326 May 23, 2024
5844fac
feat(email): set email provider
May 23, 2024
49ac041
fix(RF32): Moved 'RawExpenseReport' from mapper to entity files
Ian326 May 23, 2024
49888be
fix(RF32): Removed unnecesary functions
Ian326 May 23, 2024
da16840
fix(RF32): Added employee name to request
Ian326 May 23, 2024
1c52c6b
chore(develop): new feature added from feat/RF32-ExpenseReportSheets
salgue441 May 23, 2024
063ce20
fix(clientForm): correctly parse the data
printchard May 23, 2024
9728271
fix(clientUpdate): correctly show email error
printchard May 24, 2024
4560579
Merge pull request #206 from Black-Dot-2024/fix/clientForm
OlimpiaGarcia May 24, 2024
cd0afd7
feat(backend): get expenses
RamonaNF May 24, 2024
44eb9dd
Merge pull request #207 from Black-Dot-2024/develop
DHurtado714-itesm May 24, 2024
8d99ad6
feat(provider): resend email provider
May 24, 2024
06a3a41
refactor(task): simplify some code
May 24, 2024
49a06f2
feat(notification): logic to send notification
May 24, 2024
f718af5
fix(expense): Add missing fields for 'expense' & 'expense_report' tables
Ian326 May 24, 2024
83bf2f5
fix(RF32): Added missing fields for 'ExpenseReport' to request
Ian326 May 24, 2024
76424ac
feat(project): add zod validation in update project
RodrigoTeran May 24, 2024
084ec31
feat(project): add 'areDatesValid()' to validate project dates
RodrigoTeran May 24, 2024
07798ce
fix(project): moved validations to services layer
RodrigoTeran May 24, 2024
74fc49f
fix(project): isChargeable can be null
RodrigoTeran May 24, 2024
4bfdf32
feat(notification): added notificacionSchema
RodrigoTeran May 24, 2024
fae1811
fix(notification): fix typo
RodrigoTeran May 24, 2024
a7d067d
fix(notification): update notification schema
RodrigoTeran May 24, 2024
36af0ef
fix(notification): update notification schema
RodrigoTeran May 24, 2024
e3c739d
fix(notification): update notification schema
RodrigoTeran May 24, 2024
984e8ad
feat(task): added areDatesValid in task services
RodrigoTeran May 24, 2024
2ee66dc
feat(task): added validations in task services
RodrigoTeran May 24, 2024
7e9e042
feat(task): added validations in task services
RodrigoTeran May 24, 2024
ed84784
fix(project): added more validations to createProjectRequestSchema
RodrigoTeran May 24, 2024
33f7057
fix(linter): linter:fix
RodrigoTeran May 24, 2024
f02f463
fix(tests): fix task tests to match logic
RodrigoTeran May 24, 2024
e62186d
chore(merge): Merge from develop
dembA7 May 24, 2024
8d6c257
fix(editProject): correctly set optional fields to null on update
printchard May 24, 2024
f547569
feat(test): unit testing
May 24, 2024
6f3f93c
fix(projectValidation): do not convert is chargable from boolean to null
printchard May 24, 2024
c1035cd
fix(test): run linter
May 24, 2024
72d8b5e
fix(backend): merge develop into branch
RamonaNF May 24, 2024
7f75ca3
Merge pull request #211 from Black-Dot-2024/fix/zod-validations
printchard May 24, 2024
adbdca5
Merge pull request #210 from Black-Dot-2024/fix/RF32-MissingAtribsDB
Ian326 May 24, 2024
09a6def
Revert "Fix(expenses): Added missing fields in db (Prisma migration &…
dembA7 May 24, 2024
e748fa3
Merge pull request #214 from Black-Dot-2024/revert-210-fix/RF32-Missi…
DHurtado714-itesm May 24, 2024
3237ae9
Revert "Feat/Expenses/RF32: Endpoint for expenseReport data by id"
DHurtado714-itesm May 24, 2024
8ec4f0e
Merge pull request #216 from Black-Dot-2024/revert-205-feat/RF32-Expe…
DHurtado714-itesm May 24, 2024
60e68e2
Merge pull request #217 from Black-Dot-2024/develop
DHurtado714-itesm May 24, 2024
7919e92
Merge pull request #219 from Black-Dot-2024/develop
dembA7 May 24, 2024
61e7b54
feat(RF32): Added Endpoint & Logic for 'Expense report by id'
Ian326 May 25, 2024
37f2ce2
feat(template): enviar correos para notificar las tareas
May 25, 2024
686a01f
fix(template): change subject
May 25, 2024
102eba0
chore(prisma): Update expense model on schema.prisma
dembA7 May 25, 2024
c4f5f33
feat(Backend): Eliminar cliente
A01709150 May 25, 2024
dffbeff
fix(url): fix button redirect
May 25, 2024
4ce8838
fix(schema): add missing constraint and default value
printchard May 25, 2024
a8e9341
fix(RF32): Usar el enum en el entity
Ian326 May 25, 2024
6409ace
fix(RF32): Updated Entity documentation for status
Ian326 May 25, 2024
4a52161
docs(docs): added documetation
A01709150 May 25, 2024
1a9102d
Merge pull request #208 from Black-Dot-2024/feat/RF06-send-task-email
dembA7 May 25, 2024
13a6bc1
Merge pull request #220 from Black-Dot-2024/feat/RF32-ExpenseReportDeets
Ian326 May 25, 2024
fd1c696
fix(backend): merge MBI into branch
RamonaNF May 25, 2024
738397c
fix(errorHandling): get warning when rfc is duplicated
printchard May 25, 2024
0f13c7e
feat(test): added unit testing
A01709150 May 25, 2024
d87d9c8
chore(notif): deprecate notif
May 25, 2024
d8743b1
chore(merge): Merge branch 'MBI' into feat/RF31-notificacion-entre-areas
May 25, 2024
49b22ff
chore(deprecate): remove notif
May 25, 2024
f13f190
fix(merge): git pull origin mbi, fixed merge conflicts
A01709150 May 25, 2024
48d15d8
feat(projects): include legal and accounting
May 26, 2024
134a100
Merge pull request #215 from Black-Dot-2024/feat/rf37-consultar-expenses
Ian326 May 27, 2024
102220e
fix(RF32): Add accounting role to access all expense reports
Ian326 May 27, 2024
481a398
Merge pull request #224 from Black-Dot-2024/fix/RF32-RBAC
Ian326 May 27, 2024
dfe8630
fix(tasks): tasks end date must not be greater than projects end date
sgarnica1 May 27, 2024
92e23e8
fix(tasks): do not allow tasks end date to be greater than projects e…
sgarnica1 May 27, 2024
ceadde0
fix(tasks): verify start date if exists
sgarnica1 May 27, 2024
3fafde3
fix(logs): remove console.logs
sgarnica1 May 27, 2024
f8c704d
Merge pull request #221 from Black-Dot-2024/fix/UniqueRfcAndDefaultCh…
Ian326 May 27, 2024
31a6b94
fix(dates): start date should not be before projects start date or af…
sgarnica1 May 27, 2024
4cf3104
fix(logs): remove console.logs
sgarnica1 May 27, 2024
0b20d1f
fix(comments): simplify zod and check admin role
A01709150 May 27, 2024
43106c4
fix(comment): fixed comment
A01709150 May 27, 2024
af83ee5
fix(tasks): fix tasks start and end date
sgarnica1 May 28, 2024
8adbf9a
feat(RF29): Add create expense structure
dembA7 May 28, 2024
847b113
chore(lint): Fix lint
dembA7 May 28, 2024
e52f8e7
Revert "feat(RF29): Add create expense structure"
dembA7 May 28, 2024
1e4295d
fix(tests): fix tests for tasks
sgarnica1 May 28, 2024
5124a78
chore(merge): Merge develop into MBI
dembA7 May 28, 2024
ed58549
chore(merge): Merge from develop
dembA7 May 28, 2024
8d1bf5d
feat(RF29): Add createExpenseReport function on expense repository
dembA7 May 28, 2024
0e9fd48
feat(deleteProjetc): Add function delete project by id following sequ…
OlimpiaGarcia May 28, 2024
334f7cb
feat(test): add test 'it should trhow an error if project is not dele…
OlimpiaGarcia May 28, 2024
808666a
fix(tests): fixed error
A01709150 May 28, 2024
b2b08a7
feat(notif): Include legal and accounting in projects
May 28, 2024
bba4548
chore(employee): Update getAllEmployees function signature
May 28, 2024
54e8b99
chore(health): Add health check endpoint to base router
May 28, 2024
fb4a3e6
feat(notif): Add notification endpoint for sending department notific…
May 28, 2024
19a235c
chore(employee): Add getAllEmployeesByDepartment function
May 28, 2024
ef0dc2b
feat(notif): Add sendProjectStatusUpdateNotification function
May 28, 2024
15b3c1b
feat(resend): Add ResendErrorFactory for handling Resend API errors
May 28, 2024
21a92bf
Merge pull request #228 from Black-Dot-2024/fix/tests
Ian326 May 28, 2024
fab6c98
feat(RF29): Add create expense report structure
dembA7 May 28, 2024
2195717
fix(comments): remove console logs and fixed error message
A01709150 May 28, 2024
2b2ce5c
fix(refactor): refactorizar el manejo de los roles
A01709150 May 28, 2024
cda3608
Merge pull request #222 from Black-Dot-2024/feat/RF23-Eliminar-cliente
Ian326 May 28, 2024
46d227c
fix(merge): fix merge conflict
sgarnica1 May 28, 2024
217329a
fix(merge): fix merge conflict
sgarnica1 May 28, 2024
0971315
feat(expense): add endpoint to update expense status
sgarnica1 May 28, 2024
ba5be87
test(unit): add unit tests for updateStatuById for expenses
sgarnica1 May 28, 2024
07f88b8
feat(URLVoucher): add endpoint to update expense url voucher
sgarnica1 May 28, 2024
2f94f0d
feat(notif): Add sendProjectStatusUpdateNotification function
May 28, 2024
d71e721
test(unit): add tests for updating url voucher in expenses
sgarnica1 May 28, 2024
516cd41
fix(routes): update endpoints
sgarnica1 May 28, 2024
30ae4bf
fix(routes): update endpoints
sgarnica1 May 28, 2024
5518c0a
fix(migrations): add missing migrations lost on rollback
printchard May 28, 2024
73d2820
feat(notif): Refactor sendProjectStatusUpdateNotification function
May 29, 2024
79f4496
feat(notif): Refactor sendNotificationToDepartment function
May 29, 2024
8a7a7ea
chore(merge): Merge branch 'MBI' of https://github.com/Black-Dot-2024…
OlimpiaGarcia May 29, 2024
b2ace68
fix(merge): fix merge conflict
sgarnica1 May 29, 2024
523ff8a
fix(urlVoucher): url_voucher param to urlVoucher
sgarnica1 May 29, 2024
67f234e
feat(RF32): Endpoint logic for NewExpenseReport (v1.0)
Ian326 May 30, 2024
0b41927
fix(tempalte): fix issue template
printchard May 30, 2024
588b859
feat(RF32): Endpoint logic for NewExpenseReport (v2.0)
Ian326 May 30, 2024
90523e0
feat(deleteExpenseReport): Create functions to delete expense report
yna2131 May 30, 2024
acc0121
chore(company): Comment lines that uses findRoleByEmailStub in compan…
yna2131 May 30, 2024
b3056b3
feat(deleteExpenseReport): Run test successfully
yna2131 May 30, 2024
912f138
Merge pull request #233 from Black-Dot-2024/feat/RF40-modificar-estat…
DiegoPerdomoS May 30, 2024
78597b0
chore(merge): Solve merge conflicts
yna2131 May 30, 2024
6516834
Merge pull request #230 from Black-Dot-2024/fix/missing-migrations
RodrigoTeran May 30, 2024
ae82c0a
chore(Merge): Solve merge conflict
yna2131 May 30, 2024
bf3d8e5
chore(Merge): Solve merge conflict
yna2131 May 30, 2024
489774f
chore(merge): Solve merge conflicts
yna2131 May 30, 2024
cf8301a
fix(test): Fix something wrong with the task test
yna2131 May 30, 2024
035e6cb
feat(RF29): Add unit testing for expense report creating
dembA7 May 31, 2024
50aa706
docs(RF29): Update code documentation
dembA7 May 31, 2024
4f84302
feat(RF29): Update RF29 unit testing
dembA7 May 31, 2024
0277586
fix(RF29): Add zod validation on create expense report
dembA7 May 31, 2024
d8ee4d8
chore(email): Fix typo in department email template
May 31, 2024
a8b50f5
feat(migration): create sql for deprecation
May 31, 2024
f1c637d
chore(merge): update branch
May 31, 2024
01f47e9
chore(migrations): delete key
May 31, 2024
f9cfa4e
Merge pull request #236 from Black-Dot-2024/develop
DHurtado714-itesm May 31, 2024
c645579
chore(deleteExpense): Update name of the functions
yna2131 Jun 1, 2024
1d9cef8
fix(route): Update the route to delete expense report correctly
yna2131 Jun 1, 2024
f1d2041
feat(deleteReport): Delete expense report even if it has expenses
yna2131 Jun 1, 2024
779c5a6
fix(RF29): Updated expense and expense report fields on creation
dembA7 Jun 2, 2024
7eb3b0f
chore(merge): Merge MBI into feat/RF29-create-expense-report
dembA7 Jun 2, 2024
e9e78f6
fix(RF29): Add expense limit on expense report creation
dembA7 Jun 2, 2024
4829fd6
fix(RF29): Fix expense routes RBAC
dembA7 Jun 3, 2024
4810b70
fix(client): update error message when edditing a client with duplica…
sgarnica1 Jun 3, 2024
ed58978
Merge pull request #238 from Black-Dot-2024/fix/duplicate-rfc
sgarnica1 Jun 3, 2024
8caa7ec
chore(template): Update the github defect issue template
yna2131 Jun 3, 2024
80a2001
Merge pull request #235 from Black-Dot-2024/feat/RF29-create-expense-…
dembA7 Jun 3, 2024
ff42b6d
chore(merge): Solve merge conflicts
yna2131 Jun 3, 2024
ab7bc6f
fix(createExpense): Update expense repository so data type matches wi…
yna2131 Jun 3, 2024
9b95199
feat(prisma): Update schema of prisma, the expense report table to up…
yna2131 Jun 3, 2024
08f6df9
refactor(notif): Update sendProjectStatusUpdateNotification function
Jun 3, 2024
affd02e
Merge pull request #231 from Black-Dot-2024/feat/RF31-notificacion-en…
sgarnica1 Jun 4, 2024
5e456eb
fix(employeeRepository): remove console log
OlimpiaGarcia Jun 4, 2024
2571ec5
fix(RF35): Add prisma migration on delete actions
dembA7 Jun 4, 2024
c70ee8b
fix(deleteExpenseReport): Add a new test case where the report is suc…
yna2131 Jun 4, 2024
b4ce014
chore(merge): Merge
yna2131 Jun 4, 2024
deb55c8
Merge pull request #234 from Black-Dot-2024/feat/RF35-EliminarReporte…
DHurtado714-itesm Jun 4, 2024
dc2548b
fix(rbac): reorder routes
sgarnica1 Jun 4, 2024
226a4ec
test(fix): fix tests
sgarnica1 Jun 4, 2024
6a79d93
Merge pull request #242 from Black-Dot-2024/feat/RF29-Crear-reporte-v…
sebFlores02 Jun 4, 2024
c7916ab
fix(projectest): add test to sucess
OlimpiaGarcia Jun 4, 2024
c77d4e4
chore(merge): Merge branch 'MBI' of https://github.com/Black-Dot-2024…
OlimpiaGarcia Jun 4, 2024
7db002b
fix(test): now there is a working test to delete a project
OlimpiaGarcia Jun 4, 2024
3b852e5
Merge pull request #229 from Black-Dot-2024/feat/RF13-EliminarProyecto
OlimpiaGarcia Jun 4, 2024
0551189
Merge pull request #243 from Black-Dot-2024/develop
DHurtado714-itesm Jun 4, 2024
f1be80a
fix(RF19): Email is now capped to 70 characters
dembA7 Jun 5, 2024
1d29997
chore(action): Add RESEND_API_KEY secret to develop workflow
Jun 5, 2024
163d535
fix(RF12): Add get unarchived companies endpoint
dembA7 Jun 5, 2024
2e14bde
Merge pull request #245 from Black-Dot-2024/fix/RF19-email-cap
dembA7 Jun 5, 2024
697b2a5
chore(merge): Merge develop into fix/RF12-project-unarchived-companies
dembA7 Jun 5, 2024
7c6f1fd
Merge pull request #246 from Black-Dot-2024/fix/RF12-project-unarchiv…
OlimpiaGarcia Jun 6, 2024
5ae98d4
chore(merge): Merge staging into develop
dembA7 Jun 6, 2024
abb9dec
chore(merge): Merge staging into develop
dembA7 Jun 6, 2024
a0dc825
Merge pull request #248 from Black-Dot-2024/develop
dembA7 Jun 6, 2024
20cb27a
chore(merge): Merge develop into MBI
dembA7 Jun 6, 2024
40048a8
chore(lint): Fix lint
dembA7 Jun 6, 2024
cf80fbf
Merge pull request #249 from Black-Dot-2024/MBI
dembA7 Jun 6, 2024
8036f95
chore(merge): Merge staging into develop
dembA7 Jun 6, 2024
ff61ed2
Merge pull request #250 from Black-Dot-2024/develop
dembA7 Jun 6, 2024
9743373
Revert "MBI Develop"
dembA7 Jun 6, 2024
55e1bd1
Merge pull request #251 from Black-Dot-2024/revert-249-MBI
dembA7 Jun 6, 2024
fd2a5b9
fix(RF12): Fixed wrong archived validator
dembA7 Jun 6, 2024
38c3b3a
Merge pull request #252 from Black-Dot-2024/fix/RF12-archived-validator
dembA7 Jun 6, 2024
de07057
fix(tasks): do not create task if error
sgarnica1 Jun 6, 2024
e4dd867
Merge pull request #253 from Black-Dot-2024/fix/RF25-crear-tarea
dembA7 Jun 6, 2024
c0140d2
chore(merge): Merge staging into develop
dembA7 Jun 6, 2024
36f9a6f
Merge pull request #254 from Black-Dot-2024/develop
dembA7 Jun 6, 2024
55c8fd0
Revert "Revert "MBI Develop""
dembA7 Jun 6, 2024
cf2b1f5
chore(develop): revert from revert
salgue441 Jun 6, 2024
56cdd8b
Merge pull request #256 from Black-Dot-2024/develop
dembA7 Jun 6, 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: 1 addition & 5 deletions .github/ISSUE_TEMPLATE/issue-de-defecto.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@
---
name: Issue de Defecto
about: Registrar un defecto encontrado
title: Modulo/RFXX/Detalle
title: Módulo/RFXX/Detalle
labels: ''
assignees: ''
---

# Contenido

## Test ID

## Descripción de la tarea

¿Qué esta mal?
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/develop.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on:
pull_request:
branches:
- develop
- MBI

jobs:
build:
Expand Down Expand Up @@ -50,3 +51,4 @@ jobs:
env:
CI: true
FIREBASE_PRIVATE_KEY: ${{ secrets.FIREBASE_PRIVATE_KEY }}
RESEND_API_KEY: ${{ secrets.RESEND_API_KEY }}
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
"dotenv": "^16.4.5",
"express": "^4.19.2",
"firebase-admin": "^12.0.0",
"resend": "^3.2.0",
"uuid": "^9.0.1",
"zod": "^3.23.5"
},
Expand Down
Loading
Loading