16 - AWS S3 File Upload

src/ecommerce/aws/conf.py

@@ -1,11 +1,12 @@
 import datetime
 import os
 
+from .ignore import AWS_ACCESS_KEY_ID,  AWS_SECRET_ACCESS_KEY
 
 AWS_GROUP_NAME = "CFE_eCommerce_Group"
 AWS_USERNAME = "cfe-ecommerce-user"
-AWS_ACCESS_KEY_ID = os.environ.get("AWS_ACCESS_KEY_ID", "AKIAJARK375PALZJC55Q")
-AWS_SECRET_ACCESS_KEY = os.environ.get("AWS_SECRET_ACCESS_KEY", "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")
+# AWS_ACCESS_KEY_ID = os.environ.get("AWS_ACCESS_KEY_ID", "AKIAJARK375PALZJC55Q")
+# AWS_SECRET_ACCESS_KEY = os.environ.get("AWS_SECRET_ACCESS_KEY", "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")
 
 AWS_FILE_EXPIRE = 200
 AWS_PRELOAD_METADATA = True

src/ecommerce/aws/ignore.py

@@ -0,0 +1,3 @@
+import os
+AWS_ACCESS_KEY_ID = os.environ.get("AWS_ACCESS_KEY_ID", "AKIAI7CMDWSUQZA33PBQ")
+AWS_SECRET_ACCESS_KEY = os.environ.get("AWS_SECRET_ACCESS_KEY", "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")

src/ecommerce/aws/utils.py

@@ -1,4 +1,5 @@
 from storages.backends.s3boto3 import S3Boto3Storage
 
 StaticRootS3BotoStorage = lambda: S3Boto3Storage(location='static')
-MediaRootS3BotoStorage  = lambda: S3Boto3Storage(location='media')
+MediaRootS3BotoStorage  = lambda: S3Boto3Storage(location='media')
+ProtectedS3Storage  = lambda: S3Boto3Storage(location='protected')

src/ecommerce/settings/base.py

@@ -180,6 +180,13 @@
 MEDIA_ROOT = os.path.join(os.path.dirname(BASE_DIR), "static_cdn", "media_root")
 
 
+PROTECTED_ROOT = os.path.join(os.path.dirname(BASE_DIR), "static_cdn", "protected_media")
+
+
+
+from ecommerce.aws.conf import *
+
+
 CORS_REPLACE_HTTPS_REFERER      = False
 HOST_SCHEME                     = "http://"
 SECURE_PROXY_SSL_HEADER         = None

src/ecommerce/settings/local.py

@@ -178,7 +178,7 @@
 
 PROTECTED_ROOT = os.path.join(os.path.dirname(BASE_DIR), "static_cdn", "protected_media")
 
-# from ecommerce.aws.conf import *
+from ecommerce.aws.conf import *
 
 
 CORS_REPLACE_HTTPS_REFERER      = False

src/ecommerce/settings/production.py

@@ -186,7 +186,10 @@
 MEDIA_URL = '/media/'
 MEDIA_ROOT = os.path.join(os.path.dirname(BASE_DIR), "static_cdn", "media_root")
 
-# from ecommerce.aws.conf import *
+
+PROTECTED_ROOT = os.path.join(os.path.dirname(BASE_DIR), "static_cdn", "protected_media")
+
+from ecommerce.aws.conf import *
 
 
 # https://kirr.co/vklau5

src/products/models.py

@@ -8,6 +8,7 @@
 from django.db.models.signals import pre_save, post_save
 from django.urls import reverse
 
+from ecommerce.aws.utils import ProtectedS3Storage
 from ecommerce.utils import unique_slug_generator, get_filename
 
 def get_filename_ext(filepath):
@@ -104,18 +105,28 @@ def product_pre_save_receiver(sender, instance, *args, **kwargs):
 
 def upload_product_file_loc(instance, filename):
     slug = instance.product.slug
+    id_ = 0
+    try:
+        id_ = instance.id
+    except:
+        Klass = instance.__class__
+        qs = Klass.objects.all().order_by('-pk')
+        id_ = qs.first() + 1
+
     if not slug:
         slug = unique_slug_generator(instance.product)
-    location = "product/{}/".format(slug)
+    location = "product/{slug}/{id}/".format(slug=slug, id=id_)
     return location + filename #"path/to/filename.mp4"
 
 
+
 class ProductFile(models.Model):
     product         = models.ForeignKey(Product)
     file            = models.FileField(
                         upload_to=upload_product_file_loc, 
-                        storage=FileSystemStorage(location=settings.PROTECTED_ROOT)
-                        )
+                        storage=ProtectedS3Storage(), #FileSystemStorage(location=settings.PROTECTED_ROOT)
+                        ) # path
+    #filepath        = models.TextField() # '/protected/path/to/the/file/myfile.mp3'
     free            = models.BooleanField(default=False) # purchase required
     user_required   = models.BooleanField(default=False) # user doesn't matter