Merge from hotfix 0.15.1

src/simdb/database/models/file.py

@@ -31,14 +31,9 @@ class File(Base):
     __tablename__ = "files"
     id = Column(sql_types.Integer, primary_key=True)
     uuid = Column(UUID, nullable=False, unique=True, index=True)
-    usage = Column(sql_types.String(250), nullable=True)
     uri: urilib.URI = Column(URI(1024), nullable=True)
     checksum = Column(sql_types.String(64), nullable=True)
     type = Column(sql_types.Enum(DataObject.Type), nullable=True)
-    purpose = Column(sql_types.String(250), nullable=True)
-    sensitivity = Column(sql_types.String(20), nullable=True)
-    access = Column(sql_types.String(20), nullable=True)
-    embargo = Column(sql_types.String(20), nullable=True)
     datetime = Column(sql_types.DateTime, nullable=False)
 
     def __init__(
@@ -63,14 +58,9 @@ def __str__(self):
         result = ""
         for name in (
             "uuid",
-            "usage",
             "uri",
             "checksum",
             "type",
-            "purpose",
-            "sensitivity",
-            "access",
-            "embargo",
             "datetime",
         ):
             result += "  {}:{}{}\n".format(
@@ -117,12 +107,7 @@ def from_data(cls, data: Dict) -> "File":
             DataObject.Type[data_type], urilib.URI(uri), perform_integrity_check=False
         )
         file.uuid = checked_get(data, "uuid", uuid.UUID)
-        file.usage = checked_get(data, "usage", str, optional=True)
         file.checksum = checked_get(data, "checksum", str)
-        file.purpose = checked_get(data, "purpose", str, optional=True)
-        file.sensitivity = checked_get(data, "sensitivity", str, optional=True)
-        file.access = checked_get(data, "access", str, optional=True)
-        file.embargo = checked_get(data, "embargo", str, optional=True)
         file.datetime = date_parser.parse(checked_get(data, "datetime", str))
         return file
 
@@ -134,26 +119,16 @@ def from_data_model(cls, data: FileData) -> "File":
             DataObject.Type[data_type], urilib.URI(uri), perform_integrity_check=False
         )
         file.uuid = data.uuid
-        file.usage = data.usage
         file.checksum = data.checksum
-        file.purpose = data.purpose
-        file.sensitivity = data.sensitivity
-        file.access = data.access
-        file.embargo = data.embargo
         file.datetime = data.datetime
         return file
 
     def data(self, recurse: bool = False) -> Dict[str, str]:
         data = {
             "uuid": self.uuid,
-            "usage": self.usage,
             "uri": str(self.uri),
             "checksum": self.checksum,
             "type": self.type.name,
-            "purpose": self.purpose,
-            "sensitivity": self.sensitivity,
-            "access": self.access,
-            "embargo": self.embargo,
             "datetime": self.datetime.isoformat(),
         }
         return data
@@ -165,11 +140,6 @@ def to_model(self) -> FileData:
             uuid=self.uuid,
             checksum=self.checksum,
             datetime=self.datetime,
-            usage=self.usage,
-            purpose=self.purpose,
-            sensitivity=self.sensitivity,
-            access=self.access,
-            embargo=self.embargo,
         )
 
     def to_model_with_path(self) -> FileGetDataResponse:
@@ -188,10 +158,5 @@ def to_model_with_path(self) -> FileGetDataResponse:
             uuid=self.uuid,
             checksum=self.checksum,
             datetime=self.datetime,
-            usage=self.usage,
-            purpose=self.purpose,
-            sensitivity=self.sensitivity,
-            access=self.access,
-            embargo=self.embargo,
             files=files,
         )