Merge pull request #381 from ral-facilities/feature/icat5-tests#374

Changes to tests so they pass with icat 5

README.md

@@ -428,7 +428,7 @@ but covering only the most used aspects of the API).
 The configuration file (`config.json`) contains two options that will be used during the
 testing of the API. Set `test_user_credentials` and `test_mechanism` appropriately for
 your test environment, using `config.json.example` as a reference. The tests require a
-connection to an instance of ICAT, so set the rest of the config as needed.
+connection to an instance of ICAT 5, so set the rest of the config as needed. These tests have been written to assume ICAT 5 has been installed so please update to that or test with an older version of the API.
 
 By default, this will execute the repo's tests in
 Python 3.6, 3.7, 3.8, 3.9 and 3.10. For most cases, running the tests in a single Python

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",

noxfile.py

@@ -72,7 +72,16 @@ def safety(session):
             f"--output={requirements.name}",
             external=True,
         )
-        session.run("safety", "check", f"--file={requirements.name}", "--full-report")
+        # Ignore 50916 as the latest version of pydantic does not support
+        # python 3.6 which is still used in production
+        session.run(
+            "safety",
+            "check",
+            f"--file={requirements.name}",
+            "--full-report",
+            "--ignore",
+            "50916",
+        )
 
         try:
             # Due to delete=False, the file must be deleted manually