Update to schemas 0.3.1 (#132)

* Update codebase based on schemas version 0.3.1

* Update npm dependencies

Author: tschaffter

openapi.yaml

@@ -1,9 +1,9 @@
 {
     "name": "data-node",
-    "version": "0.2.1",
+    "version": "0.3.1",
     "license": "Apache-2.0",
     "devDependencies": {
-        "@openapitools/openapi-generator-cli": "^1.0.18-4.3.1"
+        "@openapitools/openapi-generator-cli": "2.1.18"
     },
     "scripts": {
         "generate:server": "openapi-generator generate -g python-flask -o server -i $npm_config_spec"

package-lock.json

@@ -33,6 +33,7 @@ setup.py
 Dockerfile
 openapi_server/__main__.py
 openapi_server/controllers/security_controller_.py
+openapi_server/test/__init__.py
 requirements.txt
 test-requirements.txt
 tox.ini

package.json

@@ -26,7 +26,7 @@ RUN pip install --no-cache-dir \
 
 EXPOSE 8080
 
-HEALTHCHECK --interval=5s --timeout=3s --start-period=5s CMD curl --fail http://localhost:8080/api/v1/healthCheck
+HEALTHCHECK --interval=60s --timeout=3s --start-period=5s CMD curl --fail http://localhost:8080/api/v1/healthCheck
 
 ENTRYPOINT ["/docker-entrypoint.sh"]
 

server/.openapi-generator-ignore

@@ -9,5 +9,4 @@ def get_health_check():  # noqa: E501
 
     :rtype: HealthCheck
     """
-    res = HealthCheck(status="pass")
-    return res, 200
+    return HealthCheck(status="pass"), 200

server/Dockerfile

@@ -36,7 +36,6 @@
 from openapi_server.models.resource_source import ResourceSource
 from openapi_server.models.response_page_metadata import ResponsePageMetadata
 from openapi_server.models.response_page_metadata_links import ResponsePageMetadataLinks
-from openapi_server.models.service import Service
 from openapi_server.models.text_annotation import TextAnnotation
 from openapi_server.models.text_date_annotation import TextDateAnnotation
 from openapi_server.models.text_date_annotation_all_of import TextDateAnnotationAllOf

server/openapi_server/controllers/health_check_controller.py

@@ -61,7 +61,7 @@ def from_dict(cls, dikt) -> 'Note':
     def id(self):
         """Gets the id of this Note.
 
-        The ID of the clinical note  # noqa: E501
+        ID of the clinical note  # noqa: E501
 
         :return: The id of this Note.
         :rtype: str
@@ -72,7 +72,7 @@ def id(self):
     def id(self, id):
         """Sets the id of this Note.
 
-        The ID of the clinical note  # noqa: E501
+        ID of the clinical note  # noqa: E501
 
         :param id: The id of this Note.
         :type id: str
@@ -134,7 +134,7 @@ def note_type(self, note_type):
     def patient_id(self):
         """Gets the patient_id of this Note.
 
-        The ID of the FHIR patient  # noqa: E501
+        ID of the FHIR patient  # noqa: E501
 
         :return: The patient_id of this Note.
         :rtype: str
@@ -145,7 +145,7 @@ def patient_id(self):
     def patient_id(self, patient_id):
         """Sets the patient_id of this Note.
 
-        The ID of the FHIR patient  # noqa: E501
+        ID of the FHIR patient  # noqa: E501
 
         :param patient_id: The patient_id of this Note.
         :type patient_id: str

server/openapi_server/controllers/service_controller.py

@@ -106,7 +106,7 @@ def note_type(self, note_type):
     def patient_id(self):
         """Gets the patient_id of this NoteCreateRequest.
 
-        The ID of the FHIR patient  # noqa: E501
+        ID of the FHIR patient  # noqa: E501
 
         :return: The patient_id of this NoteCreateRequest.
         :rtype: str
@@ -117,7 +117,7 @@ def patient_id(self):
     def patient_id(self, patient_id):
         """Sets the patient_id of this NoteCreateRequest.
 
-        The ID of the FHIR patient  # noqa: E501
+        ID of the FHIR patient  # noqa: E501
 
         :param patient_id: The patient_id of this NoteCreateRequest.
         :type patient_id: str