Commit Graph

105 Commits

Author SHA1 Message Date
juanjo
94faedecae Merge pre-dev: fix serialización LogService 2026-04-16 17:28:48 +02:00
juanjo
a8dbb62b09 fix: serializar dates/Decimal en LogService con DjangoJSONEncoder
Some checks are pending
DEPLOY_MULTI_BRACH/pipeline/head This commit looks good
DEPLOY_MULTI_BRACH/pipeline/pr-dev Build queued...
- Añadir _json_safe() que usa DjangoJSONEncoder para convertir objetos
  no serializables (datetime.date, Decimal, UUID...) antes de guardar
  en JSONField, evitando que response quede vacío silenciosamente
- Corregir condición status_code: usar 'is not None' para permitir status=0

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-04-16 17:28:48 +02:00
juanjo
0c18ffc2f9 Merge pre-dev: fix ruta data/ y LogService resiliente 2026-04-16 17:07:23 +02:00
juanjo
e908125d31 fix: corregir ruta de data/ y hacer LogService resiliente a fallos de BD
All checks were successful
DEPLOY_MULTI_BRACH/pipeline/head This commit looks good
- Mover data/.gitkeep a app/data/.gitkeep (Django busca app/data/db.sqlite3,
  no data/db.sqlite3 en la raíz del repo, porque BASE_DIR apunta a app/)
- Actualizar .gitignore para ignorar también app/data/*
- LogService.gestionar_log ahora captura excepciones internamente para que
  un fallo de BD no rompa la petición (log omitido con WARNING, no 500)
- Mover import de Log dentro del método para evitar problemas de arranque

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-04-16 17:07:23 +02:00
juanjo
5d2a6469aa Merge pre-dev: feat app general con LogService 2026-04-16 16:51:00 +02:00
juanjo
2f6564d9a6 feat: añadir app general con LogService centralizado
All checks were successful
DEPLOY_MULTI_BRACH/pipeline/pr-dev This commit looks good
DEPLOY_MULTI_BRACH/pipeline/head This commit looks good
- Crear app/general con estructura estándar del proyecto:
  · utilidades/acciones.py → LogService.gestionar_log() (única fuente de logs)
  · utilidades/utils.py → get_client_ip()
  · utilidades/custom_errors.py → ValidationError, ExternalServiceError, NotFoundError
  · exception.py, request.py, serializers.py, validaciones/
- Registrar 'general' en INSTALLED_APPS y añadir general/ a urls.py
- Refactorizar promociones/views.py para usar LogService en lugar de Log directo

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-04-16 16:50:53 +02:00
juanjo
29db0eb0a2 Merge pre-dev: refactor mover BD SQLite a carpeta data/ 2026-04-16 16:34:00 +02:00
juanjo
91fc6900eb refactor: mover BD SQLite a carpeta data/
All checks were successful
DEPLOY_MULTI_BRACH/pipeline/head This commit looks good
- Mover db.sqlite3 de raíz a data/db.sqlite3
- Actualizar settings.py: fallback SQLite a data/ cuando DB_HOST no está definido
- Actualizar .gitignore: ignorar data/* pero mantener data/.gitkeep
- Actualizar init_db.py: mensaje apunta a data/db.sqlite3
- Añadir data/.gitkeep para anclar la carpeta en git

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-04-16 16:33:26 +02:00
d444021a00 Merge pull request 'fix: corregir name en common/apps.py' (#32) from pre-dev into dev
All checks were successful
DEPLOY_MULTI_BRACH/pipeline/head This commit looks good
2026-04-16 14:12:59 +00:00
juanjo
9fba8938ee fix: corregir name en common/apps.py de 'apps.common' a 'common'
All checks were successful
DEPLOY_MULTI_BRACH/pipeline/head This commit looks good
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-04-16 16:12:40 +02:00
7a151a4768 Merge pull request 'refactor: reorganizar estructura app/api_config' (#30) from pre-dev into dev
All checks were successful
DEPLOY_MULTI_BRACH/pipeline/head This commit looks good
2026-04-16 14:02:01 +00:00
juanjo
299428741b refactor: reorganizar estructura del proyecto al estándar app/api_config
All checks were successful
DEPLOY_MULTI_BRACH/pipeline/head This commit looks good
- core/ → app/api_config/
- apps/backend_admin/ → app/backend_admin/
- apps/common/ → app/common/
- apps/promociones/ → app/promociones/
- manage.py → app/manage.py
- Añadir app/requirements.txt
- Actualizar todos los imports y referencias (DJANGO_SETTINGS_MODULE, ROOT_URLCONF, WSGI_APPLICATION, INSTALLED_APPS)
- Actualizar Dockerfile con nuevo WORKDIR

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-04-16 16:01:17 +02:00
56e7d77d63 Merge pull request 'Merge pre-dev into dev' (#28) from pre-dev into dev
All checks were successful
DEPLOY_MULTI_BRACH/pipeline/head This commit looks good
2026-04-16 13:51:17 +00:00
juanjo
27ccce862d Renombrar actions.py a acciones.py en backend_admin y promociones
All checks were successful
DEPLOY_MULTI_BRACH/pipeline/head This commit looks good
DEPLOY_MULTI_BRACH/pipeline/pr-dev This commit looks good
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-04-16 15:42:21 +02:00
1e72aa3e44 Merge pull request 'Update 0001_initial.py' (#26) from pre-dev into dev
All checks were successful
DEPLOY_MULTI_BRACH/pipeline/head This commit looks good
DEPLOY_MULTI_BRACH/pipeline/pr-master This commit looks good
Reviewed-on: #26
2026-04-14 23:17:11 +00:00
minguezsanzjuanjose
84baf8fbda Update 0001_initial.py
Some checks are pending
DEPLOY_MULTI_BRACH/pipeline/pr-dev Build queued...
DEPLOY_MULTI_BRACH/pipeline/head This commit looks good
2026-04-15 01:16:07 +02:00
b08e74f459 Merge pull request 'fix' (#25) from pre-dev into dev
All checks were successful
DEPLOY_MULTI_BRACH/pipeline/head This commit looks good
Reviewed-on: #25
2026-04-14 23:02:44 +00:00
minguezsanzjuanjose
5d69f89028 fix
All checks were successful
DEPLOY_MULTI_BRACH/pipeline/head This commit looks good
2026-04-15 01:01:46 +02:00
02aca6a2a6 Merge pull request 'Update Jenkinsfile' (#23) from pre-dev into dev
All checks were successful
DEPLOY_MULTI_BRACH/pipeline/head This commit looks good
DEPLOY_MULTI_BRACH/pipeline/pr-master This commit looks good
Reviewed-on: #23
2026-04-14 21:48:28 +00:00
minguezsanzjuanjose
4a4d0940b3 Update Jenkinsfile
All checks were successful
DEPLOY_MULTI_BRACH/pipeline/head This commit looks good
2026-04-14 23:47:24 +02:00
b4ab653c95 Merge pull request 'Update settings.py' (#22) from pre-dev into dev
All checks were successful
DEPLOY_MULTI_BRACH/pipeline/pr-master This commit looks good
DEPLOY_MULTI_BRACH/pipeline/head This commit looks good
Reviewed-on: #22
2026-04-14 21:25:16 +00:00
minguezsanzjuanjose
c32092d216 Update settings.py
All checks were successful
DEPLOY_MULTI_BRACH/pipeline/head This commit looks good
2026-04-14 23:24:27 +02:00
049764b79c Merge pull request 'Delete 0002_alter_log_options.py' (#20) from pre-dev into dev
All checks were successful
DEPLOY_MULTI_BRACH/pipeline/pr-master This commit looks good
DEPLOY_MULTI_BRACH/pipeline/head This commit looks good
Reviewed-on: #20
2026-04-14 21:03:22 +00:00
minguezsanzjuanjose
7ba79c9739 Delete 0002_alter_log_options.py
All checks were successful
DEPLOY_MULTI_BRACH/pipeline/head This commit looks good
2026-04-14 23:02:45 +02:00
c60c140a97 Merge pull request 'cambios en migraciones' (#19) from pre-dev into dev
All checks were successful
DEPLOY_MULTI_BRACH/pipeline/head This commit looks good
Reviewed-on: #19
2026-04-14 20:46:59 +00:00
minguezsanzjuanjose
bf5a38d425 cambios en migraciones
All checks were successful
DEPLOY_MULTI_BRACH/pipeline/head This commit looks good
2026-04-14 22:46:18 +02:00
f610eb24d4 Merge pull request 'feat: integración final de Jenkins con inyección de .env segura' (#18) from pre-dev into dev
All checks were successful
DEPLOY_MULTI_BRACH/pipeline/head This commit looks good
Reviewed-on: #18
2026-04-14 19:31:55 +00:00
minguezsanzjuanjose
039349b5b1 feat: integración final de Jenkins con inyección de .env segura
All checks were successful
DEPLOY_MULTI_BRACH/pipeline/head This commit looks good
2026-04-14 21:30:19 +02:00
816cc276f8 Merge pull request 'fix' (#17) from pre-dev into dev
Some checks failed
DEPLOY_MULTI_BRACH/pipeline/head There was a failure building this commit
Reviewed-on: #17
2026-04-13 23:01:41 +00:00
minguezsanzjuanjose
9dd97b34f2 fix
All checks were successful
DEPLOY_MULTI_BRACH/pipeline/head This commit looks good
2026-04-14 01:00:37 +02:00
d39e078fb6 Merge pull request 'fix admin status' (#15) from pre-dev into dev
All checks were successful
DEPLOY_MULTI_BRACH/pipeline/head This commit looks good
Reviewed-on: #15
2026-04-12 20:56:59 +00:00
juanjo
3da81a9495 fix admin status
All checks were successful
DEPLOY_MULTI_BRACH/pipeline/head This commit looks good
2026-04-12 22:56:35 +02:00
ac1c024bee Merge pull request 'endpoint de status' (#14) from pre-dev into dev
All checks were successful
DEPLOY_MULTI_BRACH/pipeline/head This commit looks good
Reviewed-on: #14
2026-04-12 20:39:31 +00:00
juanjo
e5908b1880 endpoint de status
All checks were successful
DEPLOY_MULTI_BRACH/pipeline/head This commit looks good
2026-04-12 22:38:49 +02:00
147a1d49cc Merge pull request 'pre-dev' (#13) from pre-dev into dev
All checks were successful
DEPLOY_MULTI_BRACH/pipeline/head This commit looks good
Reviewed-on: #13
2026-04-12 20:15:16 +00:00
juanjo
1bf3337616 Update .gitignore
All checks were successful
DEPLOY_MULTI_BRACH/pipeline/head This commit looks good
2026-04-12 22:12:35 +02:00
juanjo
6fb3afa472 fix para ficheros que no se suben
All checks were successful
DEPLOY_MULTI_BRACH/pipeline/head This commit looks good
2026-04-12 22:11:51 +02:00
8579af3f21 Merge pull request 'fix' (#12) from pre-dev into dev
All checks were successful
DEPLOY_MULTI_BRACH/pipeline/head This commit looks good
Reviewed-on: #12
2026-04-12 14:04:06 +00:00
minguezsanzjuanjose
102d7c6bfa fix
All checks were successful
DEPLOY_MULTI_BRACH/pipeline/head This commit looks good
2026-04-12 16:02:58 +02:00
5e04933708 Merge pull request 'ignore' (#10) from pre-dev into dev
All checks were successful
DEPLOY_MULTI_BRACH/pipeline/head This commit looks good
Reviewed-on: #10
2026-04-12 13:40:45 +00:00
minguezsanzjuanjose
ac6e336772 ignore
All checks were successful
DEPLOY_MULTI_BRACH/pipeline/head This commit looks good
2026-04-12 15:38:01 +02:00
d9bba25437 Merge pull request 'Update Jenkinsfile' (#8) from pre-dev into dev
All checks were successful
DEPLOY_MULTI_BRACH/pipeline/head This commit looks good
Reviewed-on: #8
2026-04-12 12:09:27 +00:00
minguezsanzjuanjose
e486a0f556 Update Jenkinsfile
All checks were successful
DEPLOY_MULTI_BRACH/pipeline/head This commit looks good
2026-04-12 14:08:36 +02:00
b37b581a78 Merge pull request 'pre-dev' (#6) from pre-dev into dev
Some checks failed
DEPLOY_MULTI_BRACH/pipeline/pr-master Build queued...
DEPLOY_MULTI_BRACH/pipeline/head There was a failure building this commit
Reviewed-on: #6
2026-04-12 02:52:00 +00:00
minguezsanzjuanjose
0971134702 Update docker-compose.yml
All checks were successful
DEPLOY_MULTI_BRACH/pipeline/head This commit looks good
2026-04-12 04:51:32 +02:00
minguezsanzjuanjose
02bc67c5fd Update docker-compose.yml
All checks were successful
DEPLOY_MULTI_BRACH/pipeline/head This commit looks good
2026-04-12 04:49:56 +02:00
c54e1e9b9e Merge pull request 'Update .env' (#5) from pre-dev into dev
Some checks failed
DEPLOY_MULTI_BRACH/pipeline/head There was a failure building this commit
Reviewed-on: #5
2026-04-12 02:46:57 +00:00
minguezsanzjuanjose
02feaf445d Update .env
All checks were successful
DEPLOY_MULTI_BRACH/pipeline/head This commit looks good
2026-04-12 04:46:31 +02:00
15f2a21a2c Merge pull request 'fix' (#4) from pre-dev into dev
Some checks failed
DEPLOY_MULTI_BRACH/pipeline/head There was a failure building this commit
Reviewed-on: #4
2026-04-12 02:43:35 +00:00
minguezsanzjuanjose
c8aa23b564 fix
All checks were successful
DEPLOY_MULTI_BRACH/pipeline/head This commit looks good
2026-04-12 04:43:02 +02:00