From 3231beb3c95238ed7947781804e654afd775fcb5 Mon Sep 17 00:00:00 2001 From: avinogrado Date: Mon, 23 Dec 2024 18:20:49 +0300 Subject: [PATCH 1/6] feat: keycloak container (cherry picked from commit f53b175f0eee73c8fcbdff2545c44572ce89d5d5) --- jsonDash/docker-compose.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/jsonDash/docker-compose.yaml b/jsonDash/docker-compose.yaml index 2470056..9c8c128 100644 --- a/jsonDash/docker-compose.yaml +++ b/jsonDash/docker-compose.yaml @@ -1,4 +1,9 @@ services: + keycloack: + image: keycloak/keycloak + container_name: keycloak + ports: + - 5000:5000 grafana: image: grafana/grafana container_name: grafana From ef242cb211906d956aa0b9a0e3a0ad1b25bc63da Mon Sep 17 00:00:00 2001 From: avinogrado Date: Wed, 5 Feb 2025 11:11:51 +0300 Subject: [PATCH 2/6] fix: changed keycloak docker image (cherry picked from commit 759dffbacbaaef0345035a7fade6f1227aad61e3) --- jsonDash/docker-compose.yaml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/jsonDash/docker-compose.yaml b/jsonDash/docker-compose.yaml index 9c8c128..84ea91d 100644 --- a/jsonDash/docker-compose.yaml +++ b/jsonDash/docker-compose.yaml @@ -1,7 +1,10 @@ services: - keycloack: - image: keycloak/keycloak + keycloak: container_name: keycloak + image: quay.io/keycloak/keycloak + environment: + - KC_BOOTSTRAP_ADMIN_USERNAME=admin + - KC_BOOTSTRAP_ADMIN_PASSWORD=admin ports: - 5000:5000 grafana: From 0580019b2662c8795fa252edab9b8c388b80172e Mon Sep 17 00:00:00 2001 From: avinogrado Date: Sun, 9 Feb 2025 10:26:08 +0300 Subject: [PATCH 3/6] fix: keycloak container in prod mode (cherry picked from commit 0a069365ca334962d750caae63119b60301772eb) --- jsonDash/docker-compose.yaml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/jsonDash/docker-compose.yaml b/jsonDash/docker-compose.yaml index 84ea91d..080b5b6 100644 --- a/jsonDash/docker-compose.yaml +++ b/jsonDash/docker-compose.yaml @@ -1,12 +1,13 @@ services: keycloak: - container_name: keycloak image: quay.io/keycloak/keycloak + container_name: keycloak + command: start --hostname=http://localhost:8080 --http-enabled=true environment: - - KC_BOOTSTRAP_ADMIN_USERNAME=admin - - KC_BOOTSTRAP_ADMIN_PASSWORD=admin + KEYCLOAK_ADMIN: admin + KEYCLOAK_ADMIN_PASSWORD: admin ports: - - 5000:5000 + - 8080:8080 grafana: image: grafana/grafana container_name: grafana From 6db9af656b7e3cfcad0ecfe8cd39b56163f88dfe Mon Sep 17 00:00:00 2001 From: avinogrado Date: Thu, 13 Feb 2025 19:54:01 +0300 Subject: [PATCH 4/6] fix: fixed linting --- jsonDash/Dockerfile | 2 +- jsonDash/docker-compose.yaml | 2 +- jsonDash/jsonDash/logger.py | 2 +- jsonDash/jsonDash/settings.py | 6 +++--- jsonDash/jsonDash/urls.py | 6 +++--- jsonDash/webHook/admin.py | 2 +- jsonDash/webHook/models.py | 4 ++-- jsonDash/webHook/parser.py | 3 --- jsonDash/webHook/urls.py | 4 ++-- jsonDash/webHook/views.py | 7 ++++--- 10 files changed, 18 insertions(+), 20 deletions(-) diff --git a/jsonDash/Dockerfile b/jsonDash/Dockerfile index 1289113..f6738ad 100644 --- a/jsonDash/Dockerfile +++ b/jsonDash/Dockerfile @@ -3,4 +3,4 @@ FROM python WORKDIR /usr/src/app COPY requirements.txt ./ RUN pip install -r requirements.txt -EXPOSE 8000 \ No newline at end of file +EXPOSE 8000 diff --git a/jsonDash/docker-compose.yaml b/jsonDash/docker-compose.yaml index 080b5b6..47fb996 100644 --- a/jsonDash/docker-compose.yaml +++ b/jsonDash/docker-compose.yaml @@ -40,4 +40,4 @@ services: ports: - 5432:5432 volumes: - pgdbdata: null \ No newline at end of file + pgdbdata: null diff --git a/jsonDash/jsonDash/logger.py b/jsonDash/jsonDash/logger.py index 57eda40..3fd1a1b 100644 --- a/jsonDash/jsonDash/logger.py +++ b/jsonDash/jsonDash/logger.py @@ -17,4 +17,4 @@ def setupLoggerConfig(fileName): def setupLogger(): - setupLoggerConfig("info.log") \ No newline at end of file + setupLoggerConfig("info.log") diff --git a/jsonDash/jsonDash/settings.py b/jsonDash/jsonDash/settings.py index 61998b6..9a66133 100644 --- a/jsonDash/jsonDash/settings.py +++ b/jsonDash/jsonDash/settings.py @@ -41,8 +41,8 @@ 'django.contrib.sessions', 'django.contrib.messages', 'django.contrib.staticfiles', - 'rest_framework_swagger', - 'rest_framework', + 'rest_framework_swagger', + 'rest_framework', 'drf_yasg', ] @@ -83,7 +83,7 @@ DATABASES = { "default": { "ENGINE": "django.db.backends.postgresql_psycopg2", - "NAME": os.getenv("DB_NAME"), + "NAME": os.getenv("DB_NAME"), "USER": os.getenv("DB_USER"), "PASSWORD": os.getenv("DB_PASSWORD"), "HOST": os.getenv("DB_HOST"), diff --git a/jsonDash/jsonDash/urls.py b/jsonDash/jsonDash/urls.py index 5a0e427..bacd790 100644 --- a/jsonDash/jsonDash/urls.py +++ b/jsonDash/jsonDash/urls.py @@ -32,9 +32,9 @@ urlpatterns = [ path('admin/', admin.site.urls), - path("",include("webHook.urls")), - path('docs/', schema_view.with_ui('swagger', cache_timeout=0),name='schema-swagger-ui') + path("", include("webHook.urls")), + path('docs/', schema_view.with_ui('swagger', cache_timeout=0), name='schema-swagger-ui') ] if settings.DEBUG: - urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) \ No newline at end of file + urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) diff --git a/jsonDash/webHook/admin.py b/jsonDash/webHook/admin.py index bcebc6e..aa1e08b 100644 --- a/jsonDash/webHook/admin.py +++ b/jsonDash/webHook/admin.py @@ -1,4 +1,4 @@ from django.contrib import admin from .models import jsonNode # Register your models here. -admin.site.register(jsonNode) \ No newline at end of file +admin.site.register(jsonNode) diff --git a/jsonDash/webHook/models.py b/jsonDash/webHook/models.py index 9f36caf..5754372 100644 --- a/jsonDash/webHook/models.py +++ b/jsonDash/webHook/models.py @@ -4,7 +4,7 @@ class jsonNode(models.Model): column_key = models.TextField(default="") value = models.TextField(default="") - parent_id = models.IntegerField(default= 0) + parent_id = models.IntegerField(default=0) def __str__(self): - return f"{self.id} {self.column_key} {self.value} {self.parent_id}" \ No newline at end of file + return f"{self.id} {self.column_key} {self.value} {self.parent_id}" diff --git a/jsonDash/webHook/parser.py b/jsonDash/webHook/parser.py index f1487b8..ef276d9 100644 --- a/jsonDash/webHook/parser.py +++ b/jsonDash/webHook/parser.py @@ -19,10 +19,7 @@ def json_parser(json:dict,last_id: int): string = jsonNode(column_key = json[i][j],value = 'null',parent_id = arr_id) string.save() else: - # last_id = jsonNode.objects.last().id string = jsonNode(column_key = i,value = str(json[i]),parent_id = last_id) string.save() except ValidationError: pass - # logging.exception('Data is not valid') - # return Response(string,status=status.HTTP_400_BAD_REQUEST) \ No newline at end of file diff --git a/jsonDash/webHook/urls.py b/jsonDash/webHook/urls.py index aab122b..36867fa 100644 --- a/jsonDash/webHook/urls.py +++ b/jsonDash/webHook/urls.py @@ -4,5 +4,5 @@ app_name = "webHook" router = DefaultRouter() -router.register('jsonNode',views.Node_API_View,basename='jsonNode') -urlpatterns = router.urls \ No newline at end of file +router.register('jsonNode', views.Node_API_View, basename='jsonNode') +urlpatterns = router.urls diff --git a/jsonDash/webHook/views.py b/jsonDash/webHook/views.py index 67bda63..c6fc42f 100644 --- a/jsonDash/webHook/views.py +++ b/jsonDash/webHook/views.py @@ -32,7 +32,7 @@ def retrieve(self, request, *args, **kwargs): return Response(status=status.HTTP_404_NOT_FOUND) def create(self,request,*args,**kwargs): - logging.info(f"{request},{request.data}") + logging.info(f"{request}, {request.data}") data = request.data for i in data: flg = True @@ -45,8 +45,9 @@ def create(self,request,*args,**kwargs): name = data['name'] new_project = jsonNode(column_key = 'name',value = name,parent_id = -1) new_project.save() - json_parser(data,new_project.id) + json_parser(data, new_project.id) return Response(request,status=status.HTTP_201_CREATED) + def destroy(self,request,*args,**kwargs): logging.info(f'{request},delete - id = {kwargs["pk"]}') try: @@ -61,4 +62,4 @@ def destroy(self,request,*args,**kwargs): return Response(status=status.HTTP_404_NOT_FOUND) except IndexError: logging.exception("Index out of range") - return Response(status=status.HTTP_404_NOT_FOUND) \ No newline at end of file + return Response(status=status.HTTP_404_NOT_FOUND) From 2b5d4d1cec379f799e4abe1074c4bd3f68dad4ea Mon Sep 17 00:00:00 2001 From: avinogrado Date: Wed, 19 Feb 2025 18:52:01 +0300 Subject: [PATCH 5/6] fix: specified python version --- jsonDash/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 ./ From b07a66446a283a3c3620500f3a7b9127d9d1c4f6 Mon Sep 17 00:00:00 2001 From: avinogrado Date: Wed, 19 Feb 2025 19:01:43 +0300 Subject: [PATCH 6/6] feat: applied .env file to docker-compose for postgres container configuration --- jsonDash/docker-compose.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jsonDash/docker-compose.yaml b/jsonDash/docker-compose.yaml index 47fb996..e0f6268 100644 --- a/jsonDash/docker-compose.yaml +++ b/jsonDash/docker-compose.yaml @@ -31,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/