Merge pull request #487 from ral-facilities/#486-fix-datafileCreateTi…

…me-datafileModTime Update icat_db_generator.py to properly set datafileCreateTime & datafileModTime
ral-facilities · Aug 1, 2024 · 7ecf5d9 · 7ecf5d9
2 parents a9f336c + 303529d
commit 7ecf5d9
Show file tree

Hide file tree

Showing 4 changed files with 71 additions and 15 deletions.
diff --git a/noxfile.py b/noxfile.py
@@ -129,6 +129,58 @@ def safety(session):
             "62452",
             "--ignore",
             "62556",
+            "--ignore",
+            "63687",
+            "--ignore",
+            "64121",
+            "--ignore",
+            "64227",
+            "--ignore",
+            "65212",
+            "--ignore",
+            "64484",
+            "--ignore",
+            "65278",
+            "--ignore",
+            "65510",
+            "--ignore",
+            "65647",
+            "--ignore",
+            "66704",
+            "--ignore",
+            "66777",
+            "--ignore",
+            "67892",
+            "--ignore",
+            "70612",
+            "--ignore",
+            "70624",
+            "--ignore",
+            "70790",
+            "--ignore",
+            "70982",
+            "--ignore",
+            "70993",
+            "--ignore",
+            "71064",
+            "--ignore",
+            "71083",
+            "--ignore",
+            "71219",
+            "--ignore",
+            "71590",
+            "--ignore",
+            "71591",
+            "--ignore",
+            "71594",
+            "--ignore",
+            "71595",
+            "--ignore",
+            "71680",
+            "--ignore",
+            "71681",
+            "--ignore",
+            "71684",
         )
 
         try:

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -23,7 +23,7 @@ Flask = "^2.0.3"
 Flask-RESTful = "^0.3.7"
 SQLAlchemy = "^1.3.8"
 PyMySQL = "1.0.2"
-Flask-Cors = "3.0.9"
+Flask-Cors = "^4.0.1"
 apispec = "3.3.0"
 flask-swagger-ui = "3.25.0"
 PyYAML = "^6.0"

diff --git a/util/icat_db_generator.py b/util/icat_db_generator.py
@@ -962,8 +962,6 @@ def generate_datafile(cls, i):
         datafile.description = faker.text()
         datafile.doi = faker.isbn10(separator="-")
         datafile.checksum = faker.md5()
-        datafile.datafileCreateTime = datafile.createTime
-        datafile.datafileModTime = datafile.modTime
         datafile.fileSize = faker.random_int(123, 213123121)
         datafile.datafileFormat = cls.client.get(
             "DatafileFormat", faker.random_int(1, DatafileFormatGenerator.amount - 1),
@@ -973,8 +971,15 @@ def generate_datafile(cls, i):
         )
         datafile.name = f"Datafile {i}"
         datafile.location = faker.file_path(depth=2, category="image")
+
         datafile.create()
 
+        datafile.get()
+        datafile.datafileCreateTime = datafile.createTime
+        datafile.datafileModTime = datafile.modTime
+
+        datafile.update()
+
 
 class PermissibleStringValueGenerator(Generator):
     tier = 4