diff --git a/ereuse_devicehub/migrations/versions/7ecb8ff7abad_documents.py b/ereuse_devicehub/migrations/versions/7ecb8ff7abad_documents.py index e75c3470..e111580d 100644 --- a/ereuse_devicehub/migrations/versions/7ecb8ff7abad_documents.py +++ b/ereuse_devicehub/migrations/versions/7ecb8ff7abad_documents.py @@ -70,7 +70,7 @@ def upgrade(): # DataWipe table op.create_table('data_wipe', - sa.Column('document_id', sa.BigInteger(), nullable=True), + sa.Column('document_id', sa.BigInteger(), nullable=False), sa.Column('id', postgresql.UUID(as_uuid=True), nullable=False), sa.ForeignKeyConstraint(['document_id'], [f'{get_inv()}.document.id'], ), sa.ForeignKeyConstraint(['id'], [f'{get_inv()}.action.id'], ), diff --git a/ereuse_devicehub/resources/documents/models.py b/ereuse_devicehub/resources/documents/models.py index 85aeb03f..fc24f190 100644 --- a/ereuse_devicehub/resources/documents/models.py +++ b/ereuse_devicehub/resources/documents/models.py @@ -20,7 +20,7 @@ class Document(Thing): date = Column(db.DateTime, nullable=True) date.comment = """The date of document, some documents need to have one date """ - id_document = Column(CIText(), nullable=False) + id_document = Column(CIText(), nullable=True) id_document.comment = """The id of one document like invoice so they can be linked.""" owner_id = db.Column(UUID(as_uuid=True), db.ForeignKey(User.id), @@ -48,7 +48,7 @@ class JoinedTableMixin: class DataWipeDocument(JoinedTableMixin, Document): """This represent a generic document.""" - software = Column(CIText(), nullable=False) + software = Column(CIText(), nullable=True) software.comment = """Which software is used""" success = Column(Boolean) success.comment = """If the erase was success""" diff --git a/ereuse_devicehub/resources/documents/schemas.py b/ereuse_devicehub/resources/documents/schemas.py index 23db2fa2..7129dc50 100644 --- a/ereuse_devicehub/resources/documents/schemas.py +++ b/ereuse_devicehub/resources/documents/schemas.py @@ -15,6 +15,7 @@ class DataWipeDocument(Thing): required=False, description=m.DataWipeDocument.date.comment) id_document = SanitizedStr(data_key='documentId', + required=False, default='', description=m.DataWipeDocument.id_document.comment) file_name = SanitizedStr(data_key='filename',