Merge branch 'url' into 'main'

switch to path

See merge request !61

.gitlab-ci.yml

@@ -18,7 +18,7 @@ stages:
 
 default:
   tags:
-    - nshmp
+    - dev
 
 ####
 # Environment Templates
@@ -121,7 +121,7 @@ default:
       " "${CI_PROJECT_NAME}" "${IMAGE_TAG}";
   stage: build
   tags:
-    - nshmp
+    - dev
   variables:
     DOCKERFILE: Dockerfile
     IMAGE_TAG: ${ENVIRONMENT}-${CI_COMMIT_SHORT_SHA}

rtgmpy/www/routers/rtgm_get_router.py

@@ -80,7 +80,7 @@ async def rtgm_get_calc(
             name=SERVICE_NAME,
             status=Status.ERROR,
             date=date(),
-            url=str(request.url),
+            url=request.url.path,
             request=raw_query,
             response=str(error),
         )

rtgmpy/www/routers/rtgm_post_router.py

@@ -102,7 +102,7 @@ async def rtgm_post_calc(
             name=SERVICE_NAME,
             status=Status.ERROR,
             date=date(),
-            url=str(request.url),
+            url=request.url.path,
             request=raw_query,
             response=str(error),
         )

rtgmpy/www/routers/rtgm_utils.py

@@ -83,7 +83,7 @@ def process_request(request: Request, query: ServiceQuery) -> Response[ServiceQu
         name=SERVICE_NAME,
         status=Status.SUCCESS,
         date=date(),
-        url=str(request.url),
+        url=request.url.path,
         request=query,
         response=rtgm_data,
     )
@@ -98,7 +98,7 @@ def usage(request: Request) -> Response[str, UsageResponse]:
     @returns The usage response
     """
 
-    url = str(request.url)
+    url = request.url.path
 
     return Response(
         name=SERVICE_NAME,