mv did as a module and migrates files to dpp

ereuse_devicehub/migrations/versions/4f33137586dd_sanitization.py

@@ -1,7 +1,7 @@
 """sanitization
 
 Revision ID: 4f33137586dd
-Revises: 8334535d56fa
+Revises: 93daff872771
 Create Date: 2023-02-13 18:01:00.092527
 
 """
@@ -14,7 +14,7 @@ from ereuse_devicehub import teal
 
 # revision identifiers, used by Alembic.
 revision = '4f33137586dd'
-down_revision = '8334535d56fa'
+down_revision = '93daff872771'
 branch_labels = None
 depends_on = None
 

ereuse_devicehub/migrations/versions/564952310b17_add_vendor_family_in_device.py

@@ -1,7 +1,7 @@
 """add vendor family in device
 
 Revision ID: 564952310b17
-Revises: 4b7f77f121bf
+Revises: af038a8a388c
 Create Date: 2022-11-14 13:12:22.916848
 
 """
@@ -11,7 +11,7 @@ from alembic import context, op
 
 # revision identifiers, used by Alembic.
 revision = '564952310b17'
-down_revision = '4b7f77f121bf'
+down_revision = 'af038a8a388c'
 branch_labels = None
 depends_on = None
 

ereuse_devicehub/modules/did/views.py

@@ -9,10 +9,10 @@ from flask.json import jsonify
 from flask.views import View
 
 from ereuse_devicehub import __version__
+from ereuse_devicehub.modules.dpp.models import Dpp
 from ereuse_devicehub.resources.device.models import Device
-from ereuse_devicehub.resources.did.models import Dpp
 
-did = Blueprint('did', __name__, url_prefix='/did')
+did = Blueprint('did', __name__, url_prefix='/did', template_folder='templates')
 
 
 class DidView(View):

ereuse_devicehub/modules/dpp/migrations/versions/4b7f77f121bf_add_api_keys_dlt_to_user.py

@@ -1,7 +1,7 @@
 """add api_keys_dlt to user
 
 Revision ID: 4b7f77f121bf
-Revises: af038a8a388c
+Revises:
 Create Date: 2022-12-01 10:35:36.795035
 
 """
@@ -11,7 +11,7 @@ from alembic import context, op
 
 # revision identifiers, used by Alembic.
 revision = '4b7f77f121bf'
-down_revision = 'af038a8a388c'
+down_revision = None
 branch_labels = None
 depends_on = None
 

ereuse_devicehub/modules/dpp/migrations/versions/8334535d56fa_add_digital_passport_dpp.py

@@ -1,7 +1,7 @@
 """add digital passport dpp
 
 Revision ID: 8334535d56fa
-Revises: 93daff872771
+Revises: 4b7f77f121bf
 Create Date: 2023-01-19 12:01:54.102326
 
 """
@@ -12,7 +12,7 @@ from sqlalchemy.dialects import postgresql
 
 # revision identifiers, used by Alembic.
 revision = '8334535d56fa'
-down_revision = '93daff872771'
+down_revision = '4b7f77f121bf'
 branch_labels = None
 depends_on = None
 

ereuse_devicehub/modules/dpp/models.py

@@ -6,7 +6,7 @@ from sqlalchemy.dialects.postgresql import UUID
 from sqlalchemy.orm import backref, relationship
 from sqlalchemy.util import OrderedSet
 
-from ereuse_devicehub.resources.action.models import ActionStatus, Snapshot
+from ereuse_devicehub.resources.action.models import Snapshot
 from ereuse_devicehub.resources.device.models import Device
 from ereuse_devicehub.resources.models import STR_SM_SIZE, Thing
 from ereuse_devicehub.resources.user.models import User
@@ -60,15 +60,6 @@ class Proof(Thing):
         primaryjoin=Snapshot.id == snapshot_id,
     )
 
-    action_status_id = Column(
-        UUID(as_uuid=True), ForeignKey(ActionStatus.id), nullable=True
-    )
-    action_status = relationship(
-        ActionStatus,
-        backref=backref('proofs', lazy=True),
-        primaryjoin=ActionStatus.id == action_status_id,
-    )
-
 
 class Dpp(Thing):
     """

ereuse_devicehub/resources/action/models.py

@@ -510,7 +510,7 @@ class EraseBasic(JoinedWithOneDeviceMixin, ActionWithOneDevice):
 
         api = API(api_dlt, token_dlt, "ethereum")
 
-        from ereuse_devicehub.resources.did.models import PROOF_ENUM, Proof
+        from ereuse_devicehub.modules.dpp.models import PROOF_ENUM, Proof
 
         deviceCHID = self.device.chid
         docSig = hashlib.sha3_256(self.snapshot.json_wb.encode('utf-8')).hexdigest()
@@ -881,7 +881,7 @@ class Snapshot(JoinedWithOneDeviceMixin, ActionWithOneDevice):
         if 'dpp' not in app.blueprints.keys() or not self.device.hid:
             return
 
-        from ereuse_devicehub.resources.did.models import Dpp
+        from ereuse_devicehub.modules.dpp.models import Dpp
 
         dpp = "{chid}:{phid}".format(chid=self.device.chid, phid=self.phid_dpp)
         if Dpp.query.filter_by(key=dpp).all():

ereuse_devicehub/resources/device/models.py

@@ -948,7 +948,7 @@ class Device(Thing):
         api = API(api_dlt, token_dlt, "ethereum")
 
         result = api.register_device(self.chid)
-        from ereuse_devicehub.resources.did.models import PROOF_ENUM, Proof
+        from ereuse_devicehub.modules.dpp.models import PROOF_ENUM, Proof
         from ereuse_devicehub.resources.enums import StatusCode
 
         if result['Status'] == StatusCode.Success.value: