diff --git a/kitchen_counter/Blockchain2/models.py b/kitchen_counter/Blockchain2/models.py new file mode 100644 index 0000000..9368187 --- /dev/null +++ b/kitchen_counter/Blockchain2/models.py @@ -0,0 +1,66 @@ +from django.db import models +from django.contrib.auth.models import User +import uuid +from storages.backends.s3boto3 import S3Boto3Storage + + + +class FailedTransactions(models.Model): + uuid = models.UUIDField(max_length=36, primary_key=True, default=uuid.uuid4, editable=True) + creator = models.ForeignKey( + User, + on_delete=models.CASCADE, + null=True, + blank=True, + related_name="transcation_created" + ) + transaction_hash = models.CharField(max_length=255, null=True, blank=True) + transaction_type = models.CharField(max_length=255, null=True, blank=True) + transaction_status = models.CharField(max_length=255, null=True, blank=True) + transaction_error = models.TextField(null=True, blank=True) + transaction_data = models.TextField(null=True, blank=True) + service_name = models.CharField(max_length=255, null=True, blank=True) + service_id = models.CharField(max_length=255, null=True, blank=True) + created_at = models.DateTimeField(auto_now_add=True) + +# app/storage_backends.py + +class PrivateMediaStorage(S3Boto3Storage): + location = 'private' + default_acl = 'private' + file_overwrite = False + +class PublicMediaStorage(S3Boto3Storage): + location = 'public' + default_acl = 'public-read' + file_overwrite = False + +class MNFServersFile(models.Model): + uuid = models.UUIDField(max_length=36, primary_key=True, default=uuid.uuid4, editable=True) + project_id = models.CharField(max_length=255, null=True, blank=True) + user = models.ForeignKey( + User, + on_delete=models.CASCADE, + null=True, + blank=True, + related_name="user_file" + ) + file_name = models.CharField(max_length=255, null=True, blank=True) + file_path = models.CharField(max_length=255, null=True, blank=True) + file_size = models.CharField(max_length=255, null=True, blank=True) + file_type = models.CharField(max_length=255, null=True, blank=True) + created_at = models.DateTimeField(auto_now_add=True) + file_url = models.CharField(max_length=255, null=True, blank=True) + file = models.FileField(upload_to='media/s3Files/', null=True, blank=True) + private_s3_file = models.FileField( + storage=PrivateMediaStorage(), + upload_to='media/s3Files/private/', + null=True, + blank=True + ) + public_file = models.FileField( + storage=PublicMediaStorage(), + upload_to='media/s3Files/public/', + null=True, + blank=True + ) diff --git a/kitchen_counter/mnfapp/models.py b/kitchen_counter/mnfapp/models.py index ab303b3..96332eb 100755 --- a/kitchen_counter/mnfapp/models.py +++ b/kitchen_counter/mnfapp/models.py @@ -292,6 +292,7 @@ class ScriptTranslations(models.Model): status = models.CharField(max_length=220, null=True, blank=True) blockchain_txhash = models.CharField(max_length=220, null=True, blank=True) error_desc = models.CharField(max_length=2000, null=True, blank=True) + User_preference = models.CharField(max_length=200, null=True, blank=True) diff --git a/kitchen_counter/scriptAudit/models.py b/kitchen_counter/scriptAudit/models.py index 3edda78..e81687d 100755 --- a/kitchen_counter/scriptAudit/models.py +++ b/kitchen_counter/scriptAudit/models.py @@ -62,4 +62,5 @@ class ScriptAuditModel(models.Model): bchain_privatekey = models.CharField(max_length=200, blank=False, null=True) isfdx = models.BooleanField(default=False) only_audit = models.BooleanField(null=True, blank=True) - error_msg = models.TimeField(null=True,blank=True) \ No newline at end of file + error_msg = models.CharField(max_length= 20 , null=True,blank=True) + User_preference = models.CharField(max_length=2000, null=True, blank=True) diff --git a/kitchen_counter/users/models.py b/kitchen_counter/users/models.py index 9b7d388..1363426 100755 --- a/kitchen_counter/users/models.py +++ b/kitchen_counter/users/models.py @@ -74,11 +74,21 @@ class ReferUser(models.Model): # status = models.CharField(max_length=100, blank=True, default="") class UserCredentialsForBlockchain(models.Model): + Userpreference = [ + ("Blockchain", "Blockchain"), + (None, None), + ("MNF", "MNF"), + ("Both", "Both"), + + ] blockChain_id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False) user = models.ForeignKey(User, on_delete=models.CASCADE) privateKey = models.CharField(max_length=1000, blank=True, null=True) publicKey = models.CharField(max_length=1000, blank=True, null=True) transaction_hash = models.CharField(max_length=1000, blank=True, null=True) + iswalletcreate = models.BooleanField(default=False) + privatekey_saved_hint = models.CharField(max_length=1000, blank=True, null=True) + FileSecureOn = models.CharField(max_length=1000,blank=True, null=True, choices=Userpreference, default=None)