Merge pull request #288 from ral-facilities/bugfix/study-pids-generat…

…or-#287 Add Study PIDs to Generator Script
ral-facilities · Nov 15, 2021 · a9a6d13 · a9a6d13
2 parents 254249f + 89a9e27
commit a9a6d13
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 0 deletions.
diff --git a/datagateway_api/common/database/models.py b/datagateway_api/common/database/models.py
@@ -1229,6 +1229,7 @@ class STUDY(Base, EntityHelper, metaclass=EntityMeta):
     modId = Column("MOD_ID", String(255), nullable=False)
     modTime = Column("MOD_TIME", DateTime, nullable=False)
     name = Column("NAME", String(255), nullable=False)
+    pid = Column("PID", String(255))
     startDate = Column("STARTDATE", DateTime)
     status = Column("STATUS", Integer)
     userID = Column("USER_ID", ForeignKey("USER_.ID"), index=True)

diff --git a/datagateway_api/src/swagger/openapi.yaml b/datagateway_api/src/swagger/openapi.yaml
@@ -1659,6 +1659,8 @@ components:
           type: string
         name:
           type: string
+        pid:
+          type: string
         startDate:
           format: datetime
           type: string

diff --git a/util/icat_db_generator.py b/util/icat_db_generator.py
@@ -423,6 +423,8 @@ def generate_user_groups(i):
 class StudyGenerator(Generator):
     tier = 3
     amount = UserGenerator.amount
+    pid_faker = Faker()
+    pid_faker.seed_instance(SEED)
 
     def generate(self):
         for i in range(1, self.amount):
@@ -434,6 +436,7 @@ def generate_studies(i):
         apply_common_attributes(study, i)
         study.startDate = get_start_date(i)
         study.status = faker.random_int(0, 1)
+        study.pid = StudyGenerator.pid_faker.isbn10(separator="-")
         study.userID = i
         post_entity(study)