Remove fhir translations

Author: jameslinnell

pyproject.toml

@@ -55,7 +55,6 @@ boto3-stubs = { extras = [
 ], version = "^1.34.37" }
 pytest-timeout = "^2.2.0"
 lz4 = "^4.3.3"
-gevent = "<24.10.2"
 
 [tool.poetry.group.local]
 optional = true

src/layers/domain/fhir/r4/cpm_model.py

@@ -1,5 +1,5 @@
 import re
-from typing import Literal  # , Dict, Union
+from typing import Literal
 from uuid import UUID
 
 from domain.core.device import DeviceKeyType, DeviceType
@@ -36,11 +36,6 @@ def dict(self, *args, **kwargs):
         return {"system": self.system, "value": str(self.value)}
 
 
-# class Link(BaseModel):
-#     relation: str
-#     url: str
-
-
 class OdsIdentifier(BaseModel):
     system: str = ConstStrField(ODS_API_BASE)
     value: str = Field(regex=ODS_CODE_REGEX)
@@ -122,48 +117,3 @@ def no_duplicate_product_keys(cls, identifier: list[DeviceIdentifier]):
             if count > 1:
                 raise ValueError("It is forbidden to supply a product_id")
         return identifier
-
-
-# class Reference(BaseModel):
-#     reference: str
-
-
-# class Answer(BaseModel):
-#     valueString: str
-
-
-# class QuestionAndAnswer(BaseModel):
-#     link_id: str
-#     text: str
-#     answer: list[Answer]
-
-
-# class QuestionnaireResponse(BaseModel):
-#     resourceType: Literal["QuestionnaireResponse"]
-#     status: str = ConstStrField("completed")
-#     subject: Reference
-#     author: Reference
-#     item: list[QuestionAndAnswer] = Field(min_items=0)
-
-
-# class Resource(BaseModel):
-#     fullUrl: str
-#     resource: Device
-#     search: Dict[str, str] = Field(default_factory=lambda: {"mode": "match"})
-
-
-# class Bundle(BaseModel):
-#     resourceType: Literal["Bundle"]
-#     id: str
-#     total: int
-#     link: list[Link]
-
-
-# class CollectionBundle(Bundle):
-#     type: str = ConstStrField("collection")
-#     entry: list[Union[Resource, QuestionnaireResponse]] = Field(min_items=1)
-
-
-# class SearchsetBundle(Bundle):
-#     type: str = ConstStrField("searchset")
-#     entry: list[CollectionBundle] = Field(min_items=0)

src/layers/domain/fhir_translation/device.py

@@ -1,25 +1,17 @@
-# from typing import List
-# from uuid import uuid4
-
 from domain.core.device import Device as DomainDevice
 from domain.core.product_team.v1 import ProductTeam
 from domain.fhir.r4 import Device as FhirDevice
 from domain.fhir.r4 import StrictDevice as StrictFhirDevice
-from domain.fhir.r4.cpm_model import SYSTEM  # , Answer, CollectionBundle
+from domain.fhir.r4.cpm_model import SYSTEM
 from domain.fhir.r4.cpm_model import Device as CpmFhirDevice
-from domain.fhir.r4.cpm_model import (  # Link,; QuestionAndAnswer,
+from domain.fhir.r4.cpm_model import (
     DeviceDefinitionIdentifier,
     DeviceDefinitionReference,
     DeviceIdentifier,
     DeviceName,
     DeviceOwnerReference,
     ProductTeamIdentifier,
 )
-
-# from domain.fhir.r4.cpm_model import (
-#     QuestionnaireResponse as CpmFhirQuestionnaireResponse,
-# )
-# from domain.fhir.r4.cpm_model import Reference, Resource, SearchsetBundle
 from domain.fhir_translation.parse import create_fhir_model_from_fhir_json
 from domain.response.validation_errors import mark_validation_errors_as_inbound
 
@@ -62,73 +54,3 @@ def create_fhir_model_from_device(device: DomainDevice) -> CpmFhirDevice:
             identifier=ProductTeamIdentifier(value=device.product_team_id)
         ),
     )
-
-
-# def create_fhir_model_from_questionnaire_response(
-#     device: DomainDevice,
-#     host,
-# ) -> CpmFhirQuestionnaireResponse:
-#     items = []
-#     for identifier, responses in device.questionnaire_responses.items():
-#         for questionnaire_response in responses:
-#             for ques_res in questionnaire_response.responses:
-#                 for question, answers in ques_res.items():
-#                     answer_objects = [Answer(valueString=answer) for answer in answers]
-#                     question_and_answer = QuestionAndAnswer(
-#                         link_id=question, text=question, answer=answer_objects
-#                     )
-#                     items.append(question_and_answer)
-
-#     return CpmFhirQuestionnaireResponse(
-#         resourceType=CpmFhirQuestionnaireResponse.__name__,
-#         # identifier="010057927542",
-#         # questionnaire="https://cpm.co.uk/Questionnaire/spine_device|v1", Doesn't exist yet
-#         subject=Reference(reference=f"https://{host}/Device/{device.id}"),
-#         # "authored": "<dateTime>",
-#         author=Reference(
-#             reference=f"https://{host}/Organization/{device.product_team_id}"
-#         ),
-#         item=items,
-#     )
-
-
-# def create_fhir_collection_bundle(
-#     device: DomainDevice,
-#     host,
-# ) -> CollectionBundle:
-#     fhir_device = create_fhir_model_from_device(device=device)
-#     fhir_resource = Resource(
-#         fullUrl=f"https://{host}/Device/{device.id}", resource=fhir_device
-#     )
-#     fhir_questionnaire = create_fhir_model_from_questionnaire_response(
-#         device=device, host=host
-#     )
-#     return CollectionBundle(
-#         resourceType="Bundle",
-#         id=str(uuid4()),
-#         total=2,
-#         link=[Link(relation="self", url=f"https://{host}/Device/{device.id}")],
-#         entry=[fhir_resource, fhir_questionnaire],
-#     )
-
-
-# def create_fhir_searchset_bundle(
-#     devices: List[DomainDevice],
-#     device_type,
-#     host,
-# ) -> SearchsetBundle:
-#     entries = []
-#     for device in devices:
-#         entries.append(create_fhir_collection_bundle(device, host))
-#     return SearchsetBundle(
-#         resourceType="Bundle",
-#         id=str(uuid4()),
-#         total=len(devices),
-#         link=[
-#             Link(
-#                 relation="self",
-#                 url=f"https://{host}/Device?device_type={device_type.lower()}",
-#             )
-#         ],
-#         entry=entries,
-#     )