Skip to content

Develop#44

Merged
DannielEU merged 5 commits intomainfrom
develop
Dec 3, 2025
Merged

Develop#44
DannielEU merged 5 commits intomainfrom
develop

Conversation

@DannielEU
Copy link
Collaborator

No description provided.

DannielEU and others added 4 commits November 28, 2025 23:14
* Develop (#31)

* Feat/auth/user management (#29)

* fix: update Prisma schema and user service to use new role and status structure

* fix: update AuthController to use gatewayUrl instead of frontendUrl for redirects

* fix: update JWT_SECRET in .env.template for consistency

* fix: PrismaClient

* fix:package.json

* fix:package.json

* fix:package

* fix: update start scripts in package.json to remove prisma migrate deploy

* fix: add environment variables for DATABASE_URL and DIRECT_URL in CI workflow

* fix: move prisma migrate deploy to prestart script in package.json

* fix: update npm commands and refine artifact upload in CI workflow

* fix: update prisma commands to use npx for consistency in package.json scripts

* fix: update Prisma commands to use direct node execution for consistency in package.json scripts

* fix: update start scripts to generate Prisma Client before migrations

* fix: standardize log messages in Prisma Client generation scripts

* fix: enhance environment variable debugging and validation logging

* feat: implement FilterUsersDto and update user retrieval with filtering options

---------

Co-authored-by: Nella1414 <marianella.polo-p@mail.escuelaing.edu.co>

* Fix/logica usuarios suprimida (#30)

* refactor: remove user management module and related services

* fix(schema): add tutorias

---------

Co-authored-by: Nella1414 <marianella.polo-p@mail.escuelaing.edu.co>

* db

* Refactor EstadoUsuario and Usuario models

* Add materiales relationship to usuarios model

* Add files via upload

* esquema

* db

* nuevo esquema

* Rename prisma.config.ts to prisma.config.ts.bak

* Rename prisma.config.ts.bak to prisma.config.ts

* Rename prisma.config.ts to prisma.config.ts.bak

* squema

* squema

* chore: update dependencies and refactor Prisma configuration (#37)

- Updated Prisma and PostgreSQL dependencies in package.json to version 7.0.1.
- Removed outdated prisma.config.ts.bak file.
- Simplified the schema.prisma datasource configuration.
- Cleaned up environment variable logging in envs.ts for better security.
- Added logging for the server startup in main.ts.
- Refactored PrismaService to use the new PrismaPg adapter for PostgreSQL.
- Created a new prisma.config.ts file to define the Prisma configuration.

* Hotfix/ymlconfig (#38)

* chore: update dependencies and refactor Prisma configuration

- Updated Prisma and PostgreSQL dependencies in package.json to version 7.0.1.
- Removed outdated prisma.config.ts.bak file.
- Simplified the schema.prisma datasource configuration.
- Cleaned up environment variable logging in envs.ts for better security.
- Added logging for the server startup in main.ts.
- Refactored PrismaService to use the new PrismaPg adapter for PostgreSQL.
- Created a new prisma.config.ts file to define the Prisma configuration.

* chore: update Azure deployment workflow for Prisma 7 compatibility

- Add include-hidden-files flag to ensure package-lock.json is included
- Add environment variables to force clean build during deployment
- Set Node.js version explicitly for deployment

---------

Co-authored-by: Nella <107373290+Nella1414@users.noreply.github.com>
Co-authored-by: Nella1414 <marianella.polo-p@mail.escuelaing.edu.co>
Co-authored-by: jared farfan <Jared.farfan-g@mail.escuelaing.edu.co>
Co-authored-by: Jared Sebastian Farfan Guevara <127908320+Jared-Farfan@users.noreply.github.com>
* fix - Ignacio Castillo: swagger corregido según últimos cambios de funcionalidades

* fix: arregladas las pruebas unitarias de gestion de usuarios

* fix: pruebas unitarias de autenticación arregladas

* fix: código duplicado solucionado
* Develop (#31)

* Feat/auth/user management (#29)

* fix: update Prisma schema and user service to use new role and status structure

* fix: update AuthController to use gatewayUrl instead of frontendUrl for redirects

* fix: update JWT_SECRET in .env.template for consistency

* fix: PrismaClient

* fix:package.json

* fix:package.json

* fix:package

* fix: update start scripts in package.json to remove prisma migrate deploy

* fix: add environment variables for DATABASE_URL and DIRECT_URL in CI workflow

* fix: move prisma migrate deploy to prestart script in package.json

* fix: update npm commands and refine artifact upload in CI workflow

* fix: update prisma commands to use npx for consistency in package.json scripts

* fix: update Prisma commands to use direct node execution for consistency in package.json scripts

* fix: update start scripts to generate Prisma Client before migrations

* fix: standardize log messages in Prisma Client generation scripts

* fix: enhance environment variable debugging and validation logging

* feat: implement FilterUsersDto and update user retrieval with filtering options

---------

Co-authored-by: Nella1414 <marianella.polo-p@mail.escuelaing.edu.co>

* Fix/logica usuarios suprimida (#30)

* refactor: remove user management module and related services

* fix(schema): add tutorias

---------

Co-authored-by: Nella1414 <marianella.polo-p@mail.escuelaing.edu.co>

* db

* Refactor EstadoUsuario and Usuario models

* Add materiales relationship to usuarios model

* Add files via upload

* esquema

* db

* nuevo esquema

* Rename prisma.config.ts to prisma.config.ts.bak

* Rename prisma.config.ts.bak to prisma.config.ts

* Rename prisma.config.ts to prisma.config.ts.bak

* squema

* squema

* chore: update dependencies and refactor Prisma configuration (#37)

- Updated Prisma and PostgreSQL dependencies in package.json to version 7.0.1.
- Removed outdated prisma.config.ts.bak file.
- Simplified the schema.prisma datasource configuration.
- Cleaned up environment variable logging in envs.ts for better security.
- Added logging for the server startup in main.ts.
- Refactored PrismaService to use the new PrismaPg adapter for PostgreSQL.
- Created a new prisma.config.ts file to define the Prisma configuration.

* Hotfix/ymlconfig (#38)

* chore: update dependencies and refactor Prisma configuration

- Updated Prisma and PostgreSQL dependencies in package.json to version 7.0.1.
- Removed outdated prisma.config.ts.bak file.
- Simplified the schema.prisma datasource configuration.
- Cleaned up environment variable logging in envs.ts for better security.
- Added logging for the server startup in main.ts.
- Refactored PrismaService to use the new PrismaPg adapter for PostgreSQL.
- Created a new prisma.config.ts file to define the Prisma configuration.

* chore: update Azure deployment workflow for Prisma 7 compatibility

- Add include-hidden-files flag to ensure package-lock.json is included
- Add environment variables to force clean build during deployment
- Set Node.js version explicitly for deployment

* Delete prisma/migrations/20251126125410_add_tutoring_system directory

---------

Co-authored-by: Nella <107373290+Nella1414@users.noreply.github.com>
Co-authored-by: Nella1414 <marianella.polo-p@mail.escuelaing.edu.co>
Co-authored-by: jared farfan <Jared.farfan-g@mail.escuelaing.edu.co>
Co-authored-by: Jared Sebastian Farfan Guevara <127908320+Jared-Farfan@users.noreply.github.com>
@sonarqubecloud
Copy link

sonarqubecloud bot commented Dec 3, 2025

@DannielEU DannielEU merged commit e6672b9 into main Dec 3, 2025
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants