object

back/frontImages/admin.py

@@ -1,5 +1,4 @@
 from django.contrib import admin
-from .models import Element3D, ClickableArea
+from .models import Image
 
-admin.site.register(Element3D)
-admin.site.register(ClickableArea)
+admin.site.register(Image)

back/frontImages/models.py

@@ -1,5 +1,4 @@
 from django.db import models
-
 import logging
 
 logger = logging.getLogger("root")
@@ -10,6 +9,7 @@ def group_based_upload_to(instance, filename):
         type(instance).__name__.lower(), instance.id, filename
     )
 
+    
 class Image(models.Model):
     file = models.ImageField(upload_to=group_based_upload_to)
     alt = models.CharField(max_length=255)
@@ -17,21 +17,3 @@ class Image(models.Model):
 
     def __str__(self):
         return self.title
-    
-
-class Element3D(models.Model):
-    model_file = models.FileField(upload_to=group_based_upload_to)
-    name = models.CharField(max_length=255)
-    description = models.TextField()
-
-    def __str__(self):
-        return self.name
-
-class ClickableArea(models.Model):
-    name = models.CharField(max_length=255)
-    description = models.TextField()
-    object_name = models.CharField(max_length=255)
-    target = models.ForeignKey(Element3D, on_delete=models.CASCADE, related_name='clickable_areas')
-
-    def __str__(self):
-        return self.name

back/object/admin.py

@@ -1,5 +1,5 @@
 from django.contrib import admin
-from .models import object
-
-admin.site.register(object)
+from .models import Element3D, ClickableArea
 
+admin.site.register(Element3D)
+admin.site.register(ClickableArea)

back/object/models.py

@@ -1,9 +1,27 @@
 from django.db import models
+import logging
 
-class Image(models.Model):
-    file = models.ImageField(upload_to='images/')
-    alt = models.CharField(max_length=255)
-    title = models.CharField(max_length=255)
+logger = logging.getLogger("root")
+
+def group_based_upload_to(instance, filename):
+    logger.info(instance)
+    return "files/image/{}/{}/{}".format(
+        type(instance).__name__.lower(), instance.id, filename
+    )
+
+class Element3D(models.Model):
+    model_file = models.FileField(upload_to=group_based_upload_to)
+    name = models.CharField(max_length=255)
+    description = models.TextField()
 
     def __str__(self):
-        return self.title
+        return self.name
+
+class ClickableArea(models.Model):
+    name = models.CharField(max_length=255)
+    description = models.TextField()
+    object_name = models.CharField(max_length=255)
+    target = models.ForeignKey(Element3D, on_delete=models.CASCADE, related_name='clickable_areas')
+
+    def __str__(self):
+        return self.name