WIP

.gitlab-ci.yml

@@ -275,6 +275,30 @@ test-search-service:
       junit: ./dbrepo-search-service/report.xml
   coverage: '/TOTAL.*?([0-9]{1,3})%/'
 
+test-search-service-init:
+  image: docker.io/python:3.11-alpine
+  stage: test
+  variables:
+    PIPENV_PIPFILE: "./dbrepo-search-service/init/Pipfile"
+  needs:
+    - build-search-service
+  dependencies:
+    - build-search-service
+  script:
+    - "pip install pipenv"
+    - "pipenv install gunicorn && pipenv install --dev --system --deploy"
+    - cd ./dbrepo-search-service/init/ && coverage run -m pytest test/test_app.py --junitxml=report.xml && coverage html --omit="test/*,omlib/*" && coverage report --omit="test/*,omlib/*" > ./coverage.txt
+    - "cat ./coverage.txt | grep -o 'TOTAL[^%]*%'"
+  artifacts:
+    when: always
+    paths:
+      - ./dbrepo-search-service/init/report.xml
+      - ./dbrepo-search-service/init/coverage.txt
+    expire_in: 1 days
+    reports:
+      junit: ./dbrepo-search-service/init/report.xml
+  coverage: '/TOTAL.*?([0-9]{1,3})%/'
+
 test-lib:
   image: docker.io/python:3.11-alpine
   stage: test

lib/python/dbrepo/api/dto.py

@@ -11,14 +11,6 @@ Timestamp = Annotated[
 ]
 
 
-class ImageDate(BaseModel):
-    id: int
-    database_format: str
-    unix_format: str
-    has_time: bool
-    created_at: Timestamp
-
-
 class JwtAuth(BaseModel):
     access_token: str
     refresh_token: str
@@ -40,7 +32,7 @@ class Image(BaseModel):
     driver_class: str
     jdbc_method: str
     default_port: int
-    date_formats: Optional[List[ImageDate]] = field(default_factory=list)
+    data_types: List[DataType] = field(default_factory=list)
 
 
 class ImageBrief(BaseModel):
@@ -520,7 +512,6 @@ class CreateTableColumn(BaseModel):
     index_length: Optional[int] = None
     size: Optional[int] = None
     d: Optional[int] = None
-    dfid: Optional[int] = None
     enums: Optional[List[str]] = None
     sets: Optional[List[str]] = None
 
@@ -883,6 +874,24 @@ class UpdateQuery(BaseModel):
     persist: bool
 
 
+class DataType(BaseModel):
+    display_name: str
+    value: str
+    documentation: str
+    is_quoted:  bool
+    is_buildable:  bool
+    size_min: Optional[int] = None
+    size_max: Optional[int] = None
+    size_default: Optional[int] = None
+    size_required: Optional[bool] = None
+    d_min: Optional[int] = None
+    d_max: Optional[int] = None
+    d_default: Optional[int] = None
+    d_required: Optional[bool] = None
+    data_hint:  Optional[str] = None
+    type_hint:  Optional[str] = None
+
+
 class Column(BaseModel):
     id: int
     name: str
@@ -902,7 +911,6 @@ class Column(BaseModel):
     unit: Optional[Unit] = None
     enums: Optional[List[str]] = field(default_factory=list)
     sets: Optional[List[str]] = field(default_factory=list)
-    date_format: Optional[ImageDate] = None
     index_length: Optional[int] = None
     length: Optional[int] = None
     data_length: Optional[int] = None
@@ -928,7 +936,6 @@ class ViewColumn(BaseModel):
     median: Optional[float] = None
     concept: Optional[Concept] = None
     unit: Optional[Unit] = None
-    date_format: Optional[ImageDate] = None
     index_length: Optional[int] = None
     length: Optional[int] = None
 

make/test.mk

@@ -12,6 +12,10 @@ test-metadata-service: ## Test the Metadata Service.
 test-analyse-service: ## Test the Analyse Service.
 	bash ./dbrepo-analyse-service/test.sh
 
+.PHONY: test-search-service
+test-search-service: ## Test the Search Service
+	bash ./dbrepo-search-service/test.sh
+
 .PHONY: test-lib
 test-lib: ## Test the Python Library.
 	bash ./lib/python/test.sh