feat: Changes to tests so they pass with icat 5

ral-facilities · Sep 22, 2022 · 73f3c77 · 73f3c77
1 parent 8eb3ea4
commit 73f3c77
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 0 deletions.
diff --git a/datagateway_api/src/datagateway_api/database/models.py b/datagateway_api/src/datagateway_api/database/models.py
@@ -656,6 +656,8 @@ class INVESTIGATION(Base, EntityHelper, metaclass=EntityMeta):
     typeID = Column(
         "TYPE_ID", ForeignKey("INVESTIGATIONTYPE.ID"), nullable=False, index=True,
     )
+    fileSize = Column("FILESIZE", BigInteger)
+    fileCount = Column("FILECOUNT", BigInteger)
 
     FACILITY = relationship(
         "FACILITY",

diff --git a/test/datagateway_api/db/conftest.py b/test/datagateway_api/db/conftest.py
@@ -45,6 +45,8 @@ def create_investigation_db_data(num_entities=1):
         investigation.visitId = str(uuid.uuid1())
         investigation.facilityID = 1
         investigation.typeID = 1
+        investigation.fileSize = 1073741824
+        investigation.fileCount = 3
 
         set_meta_attributes(investigation)
 

diff --git a/test/datagateway_api/db/test_entity_helper.py b/test/datagateway_api/db/test_entity_helper.py
@@ -145,6 +145,8 @@ def test_valid_to_dict(self, datafile_entity):
                             "id": None,
                             "createId": None,
                             "createTime": None,
+                            "fileCount": None,
+                            "fileSize": None,
                             "doi": None,
                             "endDate": None,
                             "modId": None,

diff --git a/test/datagateway_api/icat/conftest.py b/test/datagateway_api/icat/conftest.py
@@ -35,6 +35,8 @@ def create_investigation_test_data(client, num_entities=1):
         investigation.endDate = datetime(
             year=2020, month=1, day=8, hour=1, minute=1, second=1, tzinfo=tzlocal(),
         )
+        investigation.fileSize = 1073741824
+        investigation.fileCount = 3
         # UUID visit ID means uniquesness constraint should always be met
         investigation.visitId = str(uuid.uuid1())
         investigation.facility = client.get("Facility", 1)

diff --git a/test/datagateway_api/icat/endpoints/test_create_icat.py b/test/datagateway_api/icat/endpoints/test_create_icat.py
@@ -23,6 +23,8 @@ def test_valid_create_data(
                 "doi": "DataGateway API Test DOI",
                 "facility": 1,
                 "type": 1,
+                "fileCount": 1,
+                "fileSize": 6,
             }
             for i in range(2)
         ]
@@ -60,6 +62,8 @@ def test_valid_boundary_create_data(
             "doi": "DataGateway API Test DOI",
             "facility": 1,
             "type": 1,
+            "fileCount": 3,
+            "fileSize": 2,
         }
 
         test_response = flask_test_app_icat.post(

diff --git a/test/datagateway_api/icat/test_query.py b/test/datagateway_api/icat/test_query.py
@@ -134,6 +134,8 @@ def test_invalid_query_creation(self, icat_client):
                     {
                         "doi": None,
                         "endDate": "2020-01-08 01:01:01+00:00",
+                        "fileCount": 3,
+                        "fileSize": 1073741824,
                         "name": "Test Data for DataGateway API Testing 0",
                         "releaseDate": None,
                         "startDate": "2020-01-04 01:01:01+00:00",
@@ -164,6 +166,8 @@ def test_invalid_query_creation(self, icat_client):
                         "summary": None,
                         "title": "Test data for the Python ICAT Backend on DataGateway"
                         " API 0",
+                        "fileCount": 3,
+                        "fileSize": 1073741824,
                         "facility": {
                             "createId": "user",
                             "createTime": "2002-11-27 06:20:36+00:00",
@@ -207,6 +211,8 @@ def test_invalid_query_creation(self, icat_client):
                     {
                         "doi": None,
                         "endDate": "2020-01-08 01:01:01+00:00",
+                        "fileCount": 3,
+                        "fileSize": 1073741824,
                         "name": "Test Data for DataGateway API Testing 0",
                         "releaseDate": None,
                         "startDate": "2020-01-04 01:01:01+00:00",