156 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
juanjo	c692ce2a61	sync	2026-04-17 01:15:05 +02:00
juanjo	152e9c14ef	Merge: docs flujo ramas	2026-04-17 01:15:05 +02:00
juanjo	99de5f06b5	docs: corregir flujo de ramas en CLAUDE.md (pre-dev → dev → master) ... Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-04-17 01:15:04 +02:00
juanjo	d7a84a4dfa	Merge master: fix api_hub_dispatcher → api_config	2026-04-17 01:13:54 +02:00
juanjo	fbc5f0f6c4	fix: reemplazar referencias a api_hub_dispatcher por api_config ... ROOT_URLCONF, WSGI_APPLICATION, DJANGO_SETTINGS_MODULE apuntaban al módulo renombrado — causaba ModuleNotFoundError al arrancar en Docker. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-04-17 01:13:52 +02:00
juanjo	cac00a4f8c	Merge master: fix env_file docker-compose	2026-04-17 01:06:31 +02:00
juanjo	a17f00bad2	fix: env_file .env (relativo a deployments/) en docker-compose ... Jenkins copia el secret a deployments/.env — el path debe ser .env relativo al docker-compose.yml, no ../.env a la raíz del workspace. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-04-17 01:06:28 +02:00
juanjo	b8c3e03348	fix: corregir env_file path en docker-compose (../.env → .env) ... Jenkins copia el secret a deployments/.env — el path debe ser relativo al docker-compose.yml, no a la raíz del workspace. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-04-17 01:05:37 +02:00
juanjo	252e176e9d	Merge master: gunicorn + wait-for-db + healthcheck	2026-04-17 00:39:27 +02:00
juanjo	41fc2a0aa0	fix: gunicorn + wait-for-db + healthcheck en docker-compose ... - entrypoint.sh: sustituye runserver por gunicorn (workers=2, timeout=120) - entrypoint.sh: espera a PostgreSQL antes de migrar cuando DB_HOST está definido - docker-compose.yml: unifica nombre de servicio db, añade healthcheck robusto, corrige env_file path a ../.env Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-04-17 00:39:21 +02:00
juanjo	001bf13d26	chore: añadir CLAUDE.md con convenciones del ecosistema ... Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-04-17 00:12:18 +02:00
juanjo	47f23a73e1	docs: README completo con despliegue, BD y mantenimiento ... Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-04-17 00:02:21 +02:00
juanjo	04c37f669c	revert: restaurar nombre api_config (revertir renombrado erróneo) ... Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-04-17 00:02:21 +02:00
juanjo	92a00ec75f	refactor: renombrar proyecto principal api_config → api_hub_dispatcher ... - Renombrar carpeta app/api_config/ → app/api_hub_dispatcher/ - Actualizar DJANGO_SETTINGS_MODULE en asgi.py, wsgi.py, manage.py - Actualizar ROOT_URLCONF y WSGI_APPLICATION en settings.py Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-04-17 00:02:21 +02:00
juanjo	30c540b6f9	revert: restaurar nombre api_config (revertir renombrado erróneo) ... Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-04-16 23:31:08 +02:00
juanjo	778753afd6	refactor: renombrar proyecto principal api_config → api_hub_dispatcher ... - Renombrar carpeta app/api_config/ → app/api_hub_dispatcher/ - Actualizar DJANGO_SETTINGS_MODULE en asgi.py, wsgi.py, manage.py - Actualizar ROOT_URLCONF y WSGI_APPLICATION en settings.py Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-04-16 23:28:43 +02:00
jjminguez	b91f5d09e5	Merge pull request 'dev' (#43) from dev into master ... Reviewed-on: #43	2026-04-16 17:32:46 +00:00
jjminguez	aee34d797d	Merge pull request 'fix engram rtk' (#42) from pre-dev into dev ... Reviewed-on: #42	2026-04-16 16:25:26 +00:00
juanjo	0fc5392bd2	fix engram rtk	2026-04-16 18:24:13 +02:00
jjminguez	1e1348bc1a	Merge pull request 'dev' (#41) from dev into master ... Reviewed-on: #41	2026-04-16 15:34:48 +00:00
jjminguez	f68029edc1	Merge pull request 'fix: serializar dates/Decimal en LogService con DjangoJSONEncoder' (#40) from pre-dev into dev ... Reviewed-on: #40	2026-04-16 15:34:11 +00:00
juanjo	384f47df5e	Merge branch 'master' of https://git.v-encore-lab.com/Proyecto-SaaS/django-core-base	2026-04-16 17:29:18 +02:00
juanjo	a8dbb62b09	fix: serializar dates/Decimal en LogService con DjangoJSONEncoder ... - 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	2684e251f7	Merge dev: fix serialización LogService	2026-04-16 17:28:48 +02:00
juanjo	94faedecae	Merge pre-dev: fix serialización LogService	2026-04-16 17:28:48 +02:00
jjminguez	3f95e92318	Merge pull request 'dev' (#39) from dev into master ... Reviewed-on: #39	2026-04-16 15:11:49 +00:00
jjminguez	aed8661331	Merge pull request 'fix: corregir ruta de data/ y hacer LogService resiliente a fallos de BD' (#38) from pre-dev into dev ... Reviewed-on: #38	2026-04-16 15:11:27 +00:00
juanjo	e908125d31	fix: corregir ruta de data/ y hacer LogService resiliente a fallos de BD ... - 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	03663aacb4	Merge dev: fix ruta data/ y LogService resiliente	2026-04-16 17:07:23 +02:00
juanjo	0c18ffc2f9	Merge pre-dev: fix ruta data/ y LogService resiliente	2026-04-16 17:07:23 +02:00
jjminguez	77b722d739	Merge pull request 'dev' (#37) from dev into master ... Reviewed-on: #37	2026-04-16 14:57:37 +00:00
jjminguez	3c7d47782b	Merge pull request 'feat: añadir app general con LogService centralizado' (#36) from pre-dev into dev ... Reviewed-on: #36	2026-04-16 14:57:20 +00:00
juanjo	156b5ad77d	Merge dev: feat app general con LogService	2026-04-16 16:51:00 +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 ... - 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
jjminguez	e2ae400889	Merge pull request 'dev' (#35) from dev into master ... Reviewed-on: #35	2026-04-16 14:37:32 +00:00
jjminguez	e597a05f08	Merge pull request 'refactor: mover BD SQLite a carpeta data/' (#34) from pre-dev into dev ... Reviewed-on: #34	2026-04-16 14:36:39 +00:00
juanjo	4425141cb3	Merge dev: refactor mover BD SQLite a carpeta data/	2026-04-16 16:34:16 +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/ ... - 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
jjminguez	0a73b91e12	Merge pull request 'fix: corregir name en common/apps.py' (#33) from dev into master	2026-04-16 14:13:02 +00:00
jjminguez	d444021a00	Merge pull request 'fix: corregir name en common/apps.py' (#32) from pre-dev into dev	2026-04-16 14:12:59 +00:00
juanjo	9fba8938ee	fix: corregir name en common/apps.py de 'apps.common' a 'common' ... Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-04-16 16:12:40 +02:00
jjminguez	508f3f028d	Merge pull request 'refactor: reorganizar estructura app/api_config' (#31) from dev into master	2026-04-16 14:02:19 +00:00
jjminguez	7a151a4768	Merge pull request 'refactor: reorganizar estructura app/api_config' (#30) from pre-dev into dev	2026-04-16 14:02:01 +00:00
juanjo	299428741b	refactor: reorganizar estructura del proyecto al estándar app/api_config ... - 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
jjminguez	bc82249a29	Merge pull request 'Merge dev into master' (#29) from dev into master	2026-04-16 13:51:32 +00:00
jjminguez	56e7d77d63	Merge pull request 'Merge pre-dev into dev' (#28) from pre-dev into dev	2026-04-16 13:51:17 +00:00
juanjo	27ccce862d	Renombrar actions.py a acciones.py en backend_admin y promociones ... Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-04-16 15:42:21 +02:00
jjminguez	f3514d399e	Merge pull request 'dev' (#27) from dev into master ... Reviewed-on: #27	2026-04-14 23:44:35 +00:00