From 3055b2bde7053e317f0640f0317af0eafa47e1d6 Mon Sep 17 00:00:00 2001 From: Berkay Date: Tue, 3 Jun 2025 15:59:04 +0300 Subject: [PATCH] updated api builds --- ServicesApi/Builds/Auth/Dockerfile | 22 +++++++++---------- .../Builds/Auth/endpoints/auth/router.py | 8 +++---- ServicesApi/Builds/Building/Dockerfile | 22 +++++++++---------- .../Builds/Building/endpoints/areas/router.py | 6 ++--- .../endpoints/building_parts/router.py | 6 ++--- .../Building/endpoints/builds/router.py | 6 ++--- .../Building/endpoints/living_space/router.py | 6 ++--- ServicesApi/Builds/Identity/Dockerfile | 22 +++++++++---------- .../Identity/endpoints/people/router.py | 6 ++--- .../Builds/Identity/endpoints/user/router.py | 6 ++--- ServicesApi/Builds/Management/Dockerfile | 22 +++++++++---------- .../endpoints/application/router.py | 6 ++--- .../Management/endpoints/duty_types/router.py | 6 ++--- .../Management/endpoints/events/router.py | 6 ++--- .../Management/endpoints/services/router.py | 6 ++--- .../Management/endpoints/tests/router.py | 6 ++--- ServicesApi/Builds/Restriction/Dockerfile | 22 +++++++++---------- ServicesWeb/customer/src/app/test/page.tsx | 4 ++-- 18 files changed, 94 insertions(+), 94 deletions(-) diff --git a/ServicesApi/Builds/Auth/Dockerfile b/ServicesApi/Builds/Auth/Dockerfile index 8db766a..10bc2a1 100644 --- a/ServicesApi/Builds/Auth/Dockerfile +++ b/ServicesApi/Builds/Auth/Dockerfile @@ -12,20 +12,20 @@ COPY /pyproject.toml ./pyproject.toml RUN poetry config virtualenvs.create false && poetry install --no-interaction --no-ansi --no-root --only main && pip cache purge && rm -rf ~/.cache/pypoetry # Copy application code -COPY /api_services/api_initializer /api_initializer -COPY /api_services/api_controllers /api_controllers -COPY /api_services/api_validations /api_validations -COPY /api_services/schemas /schemas -COPY /api_services/api_modules /api_modules +COPY /ServicesApi/Initializer /Initializer +COPY /ServicesApi/Controllers /Controllers +COPY /ServicesApi/Validations /Validations +COPY /ServicesApi/Schemas /Schemas +COPY /ServicesApi/Extensions /Extensions -COPY /api_services/api_middlewares /api_middlewares -COPY /api_services/api_builds/auth_service/endpoints /api_initializer/endpoints -COPY /api_services/api_builds/auth_service/events /api_initializer/events -COPY /api_services/api_builds/auth_service/validations /api_initializer/validations -# COPY /api_services/api_builds/auth_service/index.py /api_initializer/index.py +COPY /ServicesApi/Builds/Auth/endpoints /Initializer/endpoints +COPY /ServicesApi/Builds/Auth/events /Initializer/events +COPY /ServicesApi/Builds/Auth/validations /Initializer/validations +# COPY /ServicesApi/api_middlewares /api_middlewares +# COPY /ServicesApi/Builds/Auth/index.py /Initializer/index.py # Set Python path to include app directory ENV PYTHONPATH=/ PYTHONUNBUFFERED=1 PYTHONDONTWRITEBYTECODE=1 # Run the application using the configured uvicorn server -CMD ["poetry", "run", "python", "/api_initializer/app.py"] +CMD ["poetry", "run", "python", "/Initializer/app.py"] diff --git a/ServicesApi/Builds/Auth/endpoints/auth/router.py b/ServicesApi/Builds/Auth/endpoints/auth/router.py index d30ec33..fcbe57c 100644 --- a/ServicesApi/Builds/Auth/endpoints/auth/router.py +++ b/ServicesApi/Builds/Auth/endpoints/auth/router.py @@ -15,12 +15,12 @@ from validations.request.auth.validations import ( RequestForgotPasswordEmail, RequestVerifyOTP, ) -from events.auth.events import AuthHandlers +from events.auth.events import AuthHandlers, LoginHandler from endpoints.index import endpoints_index -from api_validations.defaults.validations import CommonHeaders -from api_middlewares.token_provider import TokenProvider -from events.auth.events import LoginHandler +from Validations.defaults.validations import CommonHeaders +from Extensions.Middlewares.token_provider import TokenProvider + auth_route = APIRouter(prefix="/authentication", tags=["Authentication Cluster"]) diff --git a/ServicesApi/Builds/Building/Dockerfile b/ServicesApi/Builds/Building/Dockerfile index 00079fd..7bcc481 100644 --- a/ServicesApi/Builds/Building/Dockerfile +++ b/ServicesApi/Builds/Building/Dockerfile @@ -12,20 +12,20 @@ COPY /pyproject.toml ./pyproject.toml RUN poetry config virtualenvs.create false && poetry install --no-interaction --no-ansi --no-root --only main && pip cache purge && rm -rf ~/.cache/pypoetry # Copy application code -COPY /api_services/api_initializer /api_initializer -COPY /api_services/api_controllers /api_controllers -COPY /api_services/api_validations /api_validations -COPY /api_services/schemas /schemas -COPY /api_services/api_modules /api_modules +COPY /ServicesApi/Initializer /Initializer +COPY /ServicesApi/Controllers /Controllers +COPY /ServicesApi/Validations /Validations +COPY /ServicesApi/Schemas /Schemas +COPY /ServicesApi/Extensions /Extensions -COPY /api_services/api_middlewares /api_middlewares -COPY /api_services/api_builds/building_service/endpoints /api_initializer/endpoints -COPY /api_services/api_builds/building_service/events /api_initializer/events -COPY /api_services/api_builds/building_service/validations /api_initializer/validations -COPY /api_services/api_builds/building_service/index.py /api_initializer/index.py +COPY /ServicesApi/Builds/Building/endpoints /Initializer/endpoints +COPY /ServicesApi/Builds/Building/events /Initializer/events +COPY /ServicesApi/Builds/Building/validations /Initializer/validations +COPY /ServicesApi/Builds/Building/index.py /Initializer/index.py +# COPY /ServicesApi/api_middlewares /api_middlewares # Set Python path to include app directory ENV PYTHONPATH=/ PYTHONUNBUFFERED=1 PYTHONDONTWRITEBYTECODE=1 # Run the application using the configured uvicorn server -CMD ["poetry", "run", "python", "/api_initializer/app.py"] +CMD ["poetry", "run", "python", "/Initializer/app.py"] diff --git a/ServicesApi/Builds/Building/endpoints/areas/router.py b/ServicesApi/Builds/Building/endpoints/areas/router.py index 4fdc17b..c5cb90e 100644 --- a/ServicesApi/Builds/Building/endpoints/areas/router.py +++ b/ServicesApi/Builds/Building/endpoints/areas/router.py @@ -4,9 +4,9 @@ from fastapi import APIRouter, Depends from index import endpoints_index from events.areas.cluster import AreaRouterCluster -from api_validations.defaults.validations import CommonHeaders -from api_validations.response.pagination import PaginateOnly -from api_middlewares.token_provider import TokenProvider +from Validations.defaults.validations import CommonHeaders +from Validations.response.pagination import PaginateOnly +from Extensions.Middlewares.token_provider import TokenProvider area_endpoint_route = APIRouter(prefix="/areas", tags=["Areas Cluster"]) diff --git a/ServicesApi/Builds/Building/endpoints/building_parts/router.py b/ServicesApi/Builds/Building/endpoints/building_parts/router.py index 2529507..ef4b946 100644 --- a/ServicesApi/Builds/Building/endpoints/building_parts/router.py +++ b/ServicesApi/Builds/Building/endpoints/building_parts/router.py @@ -4,9 +4,9 @@ from fastapi import APIRouter, Depends from index import endpoints_index from events.building_parts.cluster import PartsRouterCluster -from api_validations.defaults.validations import CommonHeaders -from api_validations.response.pagination import PaginateOnly -from api_middlewares.token_provider import TokenProvider +from Validations.defaults.validations import CommonHeaders +from Validations.response.pagination import PaginateOnly +from Extensions.Middlewares.token_provider import TokenProvider parts_endpoint_route = APIRouter(prefix="/parts", tags=["Parts Cluster"]) diff --git a/ServicesApi/Builds/Building/endpoints/builds/router.py b/ServicesApi/Builds/Building/endpoints/builds/router.py index fa33a95..4b9a684 100644 --- a/ServicesApi/Builds/Building/endpoints/builds/router.py +++ b/ServicesApi/Builds/Building/endpoints/builds/router.py @@ -4,9 +4,9 @@ from fastapi import APIRouter, Depends from index import endpoints_index from events.builds.cluster import BuildRouterCluster -from api_validations.defaults.validations import CommonHeaders -from api_validations.response.pagination import PaginateOnly -from api_middlewares.token_provider import TokenProvider +from Validations.defaults.validations import CommonHeaders +from Validations.response.pagination import PaginateOnly +from Extensions.Middlewares.token_provider import TokenProvider build_endpoint_route = APIRouter(prefix="/builds", tags=["Builds Cluster"]) diff --git a/ServicesApi/Builds/Building/endpoints/living_space/router.py b/ServicesApi/Builds/Building/endpoints/living_space/router.py index c19ecd2..3a1582c 100644 --- a/ServicesApi/Builds/Building/endpoints/living_space/router.py +++ b/ServicesApi/Builds/Building/endpoints/living_space/router.py @@ -4,9 +4,9 @@ from fastapi import APIRouter, Depends from index import endpoints_index from events.living_space.cluster import LivingSpaceRouterCluster -from api_validations.defaults.validations import CommonHeaders -from api_validations.response.pagination import PaginateOnly -from api_middlewares.token_provider import TokenProvider +from Validations.defaults.validations import CommonHeaders +from Validations.response.pagination import PaginateOnly +from Extensions.Middlewares.token_provider import TokenProvider living_space_endpoint_route = APIRouter(prefix="/living-space", tags=["Living Space Cluster"]) diff --git a/ServicesApi/Builds/Identity/Dockerfile b/ServicesApi/Builds/Identity/Dockerfile index b1195f7..9caa184 100644 --- a/ServicesApi/Builds/Identity/Dockerfile +++ b/ServicesApi/Builds/Identity/Dockerfile @@ -12,20 +12,20 @@ COPY /pyproject.toml ./pyproject.toml RUN poetry config virtualenvs.create false && poetry install --no-interaction --no-ansi --no-root --only main && pip cache purge && rm -rf ~/.cache/pypoetry # Copy application code -COPY /api_services/api_initializer /api_initializer -COPY /api_services/api_controllers /api_controllers -COPY /api_services/api_validations /api_validations -COPY /api_services/schemas /schemas -COPY /api_services/api_modules /api_modules +COPY /ServicesApi/Initializer /Initializer +COPY /ServicesApi/Controllers /Controllers +COPY /ServicesApi/Validations /Validations +COPY /ServicesApi/Schemas /Schemas +COPY /ServicesApi/Extensions /Extensions -COPY /api_services/api_middlewares /api_middlewares -COPY /api_services/api_builds/identity_service/endpoints /api_initializer/endpoints -COPY /api_services/api_builds/identity_service/events /api_initializer/events -COPY /api_services/api_builds/identity_service/validations /api_initializer/validations -COPY /api_services/api_builds/identity_service/index.py /api_initializer/index.py +COPY /ServicesApi/api_middlewares /api_middlewares +COPY /ServicesApi/Builds/Identity/endpoints /Initializer/endpoints +COPY /ServicesApi/Builds/Identity/events /Initializer/events +COPY /ServicesApi/Builds/Identity/validations /Initializer/validations +COPY /ServicesApi/Builds/Identity/index.py /Initializer/index.py # Set Python path to include app directory ENV PYTHONPATH=/ PYTHONUNBUFFERED=1 PYTHONDONTWRITEBYTECODE=1 # Run the application using the configured uvicorn server -CMD ["poetry", "run", "python", "/api_initializer/app.py"] +CMD ["poetry", "run", "python", "/Initializer/app.py"] diff --git a/ServicesApi/Builds/Identity/endpoints/people/router.py b/ServicesApi/Builds/Identity/endpoints/people/router.py index f27041d..a37f28a 100644 --- a/ServicesApi/Builds/Identity/endpoints/people/router.py +++ b/ServicesApi/Builds/Identity/endpoints/people/router.py @@ -4,9 +4,9 @@ from fastapi import APIRouter, Depends from index import endpoints_index from events.people.cluster import PeopleRouterCluster -from api_validations.defaults.validations import CommonHeaders -from api_validations.response.pagination import PaginateOnly -from api_middlewares.token_provider import TokenProvider +from Validations.defaults.validations import CommonHeaders +from Validations.response.pagination import PaginateOnly +from Extensions.Middlewares.token_provider import TokenProvider people_endpoint_route = APIRouter(prefix="/people", tags=["People Cluster"]) diff --git a/ServicesApi/Builds/Identity/endpoints/user/router.py b/ServicesApi/Builds/Identity/endpoints/user/router.py index 17043fa..7ab32b6 100644 --- a/ServicesApi/Builds/Identity/endpoints/user/router.py +++ b/ServicesApi/Builds/Identity/endpoints/user/router.py @@ -4,9 +4,9 @@ from fastapi import APIRouter, Depends from index import endpoints_index from events.user.cluster import UserRouterCluster -from api_validations.defaults.validations import CommonHeaders -from api_validations.response.pagination import PaginateOnly -from api_middlewares.token_provider import TokenProvider +from Validations.defaults.validations import CommonHeaders +from Validations.response.pagination import PaginateOnly +from Extensions.Middlewares.token_provider import TokenProvider user_endpoint_route = APIRouter(prefix="/users", tags=["User Cluster"]) diff --git a/ServicesApi/Builds/Management/Dockerfile b/ServicesApi/Builds/Management/Dockerfile index ccc9bd2..5597a17 100644 --- a/ServicesApi/Builds/Management/Dockerfile +++ b/ServicesApi/Builds/Management/Dockerfile @@ -12,20 +12,20 @@ COPY /pyproject.toml ./pyproject.toml RUN poetry config virtualenvs.create false && poetry install --no-interaction --no-ansi --no-root --only main && pip cache purge && rm -rf ~/.cache/pypoetry # Copy application code -COPY /api_services/api_initializer /api_initializer -COPY /api_services/api_controllers /api_controllers -COPY /api_services/api_validations /api_validations -COPY /api_services/api_modules /api_modules -COPY /api_services/schemas /schemas -COPY /api_services/api_middlewares /api_middlewares +COPY /ServicesApi/Initializer /Initializer +COPY /ServicesApi/Controllers /Controllers +COPY /ServicesApi/Validations /Validations +COPY /ServicesApi/Schemas /Schemas +COPY /ServicesApi/Extensions /Extensions -COPY /api_services/api_builds/management_service/endpoints /api_initializer/endpoints -COPY /api_services/api_builds/management_service/events /api_initializer/events -COPY /api_services/api_builds/management_service/validations /api_initializer/validations -COPY /api_services/api_builds/management_service/index.py /api_initializer/index.py +COPY /ServicesApi/api_middlewares /api_middlewares +COPY /ServicesApi/Builds/Management/endpoints /Initializer/endpoints +COPY /ServicesApi/Builds/Management/events /Initializer/events +COPY /ServicesApi/Builds/Management/validations /Initializer/validations +COPY /ServicesApi/Builds/Management/index.py /Initializer/index.py # Set Python path to include app directory ENV PYTHONPATH=/ PYTHONUNBUFFERED=1 PYTHONDONTWRITEBYTECODE=1 # Run the application using the configured uvicorn server -CMD ["poetry", "run", "python", "/api_initializer/app.py"] +CMD ["poetry", "run", "python", "/Initializer/app.py"] diff --git a/ServicesApi/Builds/Management/endpoints/application/router.py b/ServicesApi/Builds/Management/endpoints/application/router.py index bdf0f0b..a103299 100644 --- a/ServicesApi/Builds/Management/endpoints/application/router.py +++ b/ServicesApi/Builds/Management/endpoints/application/router.py @@ -4,9 +4,9 @@ from fastapi import APIRouter, Depends from index import endpoints_index from events.application.cluster import ApplicationRouterCluster -from api_validations.defaults.validations import CommonHeaders -from api_validations.response.pagination import PaginateOnly -from api_middlewares.token_provider import TokenProvider +from Validations.defaults.validations import CommonHeaders +from Validations.response.pagination import PaginateOnly +from Extensions.Middlewares.token_provider import TokenProvider application_endpoint_route = APIRouter(prefix="/application", tags=["Application Cluster"]) diff --git a/ServicesApi/Builds/Management/endpoints/duty_types/router.py b/ServicesApi/Builds/Management/endpoints/duty_types/router.py index 38b3b7b..2bae294 100644 --- a/ServicesApi/Builds/Management/endpoints/duty_types/router.py +++ b/ServicesApi/Builds/Management/endpoints/duty_types/router.py @@ -4,9 +4,9 @@ from fastapi import APIRouter, Depends from index import endpoints_index # from events.services.cluster import ServicesEndpointRouterCluster -from api_validations.defaults.validations import CommonHeaders -from api_validations.response.pagination import PaginateOnly -from api_middlewares.token_provider import TokenProvider +from Validations.defaults.validations import CommonHeaders +from Validations.response.pagination import PaginateOnly +from Extensions.Middlewares.token_provider import TokenProvider # Create API router diff --git a/ServicesApi/Builds/Management/endpoints/events/router.py b/ServicesApi/Builds/Management/endpoints/events/router.py index 0e6484b..619ff1b 100644 --- a/ServicesApi/Builds/Management/endpoints/events/router.py +++ b/ServicesApi/Builds/Management/endpoints/events/router.py @@ -4,9 +4,9 @@ from fastapi import APIRouter, Depends from index import endpoints_index from events.events.cluster import EventsEndpointRouterCluster -from api_validations.defaults.validations import CommonHeaders -from api_validations.response.pagination import PaginateOnly -from api_middlewares.token_provider import TokenProvider +from Validations.defaults.validations import CommonHeaders +from Validations.response.pagination import PaginateOnly +from Extensions.Middlewares.token_provider import TokenProvider # Create API router diff --git a/ServicesApi/Builds/Management/endpoints/services/router.py b/ServicesApi/Builds/Management/endpoints/services/router.py index e8eac2c..8b8eae5 100644 --- a/ServicesApi/Builds/Management/endpoints/services/router.py +++ b/ServicesApi/Builds/Management/endpoints/services/router.py @@ -4,9 +4,9 @@ from fastapi import APIRouter, Depends from index import endpoints_index from events.services.cluster import ServicesRouterCluster -from api_validations.defaults.validations import CommonHeaders -from api_validations.response.pagination import PaginateOnly -from api_middlewares.token_provider import TokenProvider +from Validations.defaults.validations import CommonHeaders +from Validations.response.pagination import PaginateOnly +from Extensions.Middlewares.token_provider import TokenProvider # Create API router diff --git a/ServicesApi/Builds/Management/endpoints/tests/router.py b/ServicesApi/Builds/Management/endpoints/tests/router.py index c0502a0..ab5c75b 100644 --- a/ServicesApi/Builds/Management/endpoints/tests/router.py +++ b/ServicesApi/Builds/Management/endpoints/tests/router.py @@ -6,9 +6,9 @@ from schemas import AccountRecords from endpoints.index import endpoints_index from events.event_endpoints.cluster import EventsEndpointRouterCluster -from api_validations.defaults.validations import CommonHeaders -from api_validations.response.pagination import PaginateOnly -from api_middlewares.token_provider import TokenProvider +from Validations.defaults.validations import CommonHeaders +from Validations.response.pagination import PaginateOnly +from Extensions.Middlewares.token_provider import TokenProvider test_endpoint_route = APIRouter(prefix="/tests", tags=["Endpoint Tests"]) diff --git a/ServicesApi/Builds/Restriction/Dockerfile b/ServicesApi/Builds/Restriction/Dockerfile index 85d9695..a554751 100644 --- a/ServicesApi/Builds/Restriction/Dockerfile +++ b/ServicesApi/Builds/Restriction/Dockerfile @@ -12,20 +12,20 @@ COPY /pyproject.toml ./pyproject.toml RUN poetry config virtualenvs.create false && poetry install --no-interaction --no-ansi --no-root --only main && pip cache purge && rm -rf ~/.cache/pypoetry # Copy application code -COPY /api_services/api_initializer /api_initializer -COPY /api_services/api_controllers /api_controllers -COPY /api_services/api_validations /api_validations -COPY /api_services/api_modules /api_modules -COPY /api_services/schemas /schemas +COPY /ServicesApi/Initializer /Initializer +COPY /ServicesApi/Controllers /Controllers +COPY /ServicesApi/Validations /Validations +COPY /ServicesApi/Schemas /Schemas +COPY /ServicesApi/Extensions /Extensions -COPY /api_services/api_middlewares /api_middlewares -COPY /api_services/api_builds/restriction_service/endpoints /api_initializer/endpoints -COPY /api_services/api_builds/restriction_service/events /api_initializer/events -COPY /api_services/api_builds/restriction_service/validations /api_initializer/validations -COPY /api_services/api_builds/restriction_service/index.py /api_initializer/index.py +COPY /ServicesApi/api_middlewares /api_middlewares +COPY /ServicesApi/Builds/Restriction/endpoints /Initializer/endpoints +COPY /ServicesApi/Builds/Restriction/events /Initializer/events +COPY /ServicesApi/Builds/Restriction/validations /Initializer/validations +COPY /ServicesApi/Builds/Restriction/index.py /Initializer/index.py # Set Python path to include app directory ENV PYTHONPATH=/ PYTHONUNBUFFERED=1 PYTHONDONTWRITEBYTECODE=1 # Run the application using the configured uvicorn server -CMD ["poetry", "run", "python", "/api_initializer/app.py"] +CMD ["poetry", "run", "python", "/Initializer/app.py"] diff --git a/ServicesWeb/customer/src/app/test/page.tsx b/ServicesWeb/customer/src/app/test/page.tsx index d8b7e1c..54a2828 100644 --- a/ServicesWeb/customer/src/app/test/page.tsx +++ b/ServicesWeb/customer/src/app/test/page.tsx @@ -22,8 +22,8 @@ const formSchema = z.object({ type FormValues = z.infer; export default function TestPage() { - const [testPostResult, setTestPostResult] = useState({}); - const [testGetResult, setTestGetResult] = useState({}); + const [testPostResult, setTestPostResult] = useState>({}); + const [testGetResult, setTestGetResult] = useState>({}); // Initialize the form const form = useForm({