diff --git a/jsonDash/Dockerfile b/jsonDash/Dockerfile index f6738ad..3ce9eb5 100644 --- a/jsonDash/Dockerfile +++ b/jsonDash/Dockerfile @@ -1,4 +1,4 @@ -FROM python +FROM python3.13.1 WORKDIR /usr/src/app COPY requirements.txt ./ diff --git a/jsonDash/docker-compose.yaml b/jsonDash/docker-compose.yaml index 6ccb46c..e0f6268 100644 --- a/jsonDash/docker-compose.yaml +++ b/jsonDash/docker-compose.yaml @@ -1,4 +1,13 @@ services: + keycloak: + image: quay.io/keycloak/keycloak + container_name: keycloak + command: start --hostname=http://localhost:8080 --http-enabled=true + environment: + KEYCLOAK_ADMIN: admin + KEYCLOAK_ADMIN_PASSWORD: admin + ports: + - 8080:8080 grafana: image: grafana/grafana container_name: grafana @@ -22,9 +31,9 @@ services: env_file: - .env environment: - - POSTGRES_DB=lighttraffic_db - - POSTGRES_USER=postgres - - POSTGRES_PASSWORD=postgres + - POSTGRES_DB=DB_NAME + - POSTGRES_USER=DB_USER + - POSTGRES_PASSWORD=DB_PASSWORD container_name: pgdb volumes: - pgdbdata:/var/lib/postgresql/data/ diff --git a/jsonDash/webHook/models.py b/jsonDash/webHook/models.py index 758cb76..c410557 100644 --- a/jsonDash/webHook/models.py +++ b/jsonDash/webHook/models.py @@ -11,4 +11,3 @@ class jsonNode(models.Model): def __str__(self): return f"{self.id} {self.column_key} {self.value} {self.parent_id}" - diff --git a/jsonDash/webHook/views.py b/jsonDash/webHook/views.py index 50c5d4c..23fde23 100644 --- a/jsonDash/webHook/views.py +++ b/jsonDash/webHook/views.py @@ -33,7 +33,7 @@ def retrieve(self, request, *args, **kwargs): except IndexError: logging.exception("Index out of range") return Response(status=status.HTTP_404_NOT_FOUND) - + def create(self, request, *args, **kwargs): logging.info(f"{request},{request.data}") data = request.data @@ -52,6 +52,7 @@ def create(self, request, *args, **kwargs): return Response(request, status=status.HTTP_201_CREATED) def destroy(self, request, *args, **kwargs): + logging.info(f'{request},delete - id = {kwargs["pk"]}') try: data = jsonNode.objects.filter(id=kwargs['pk'])[0]