From b0f05e849928ceb1b21742b752219a857a80d41a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=97=D0=B5=D0=BB=D0=B5=D0=BD=D1=81=D0=BA=D0=B0=D1=8F=20?=
 =?UTF-8?q?=D0=90=D0=BD=D0=B0=D1=81=D1=82=D0=B0=D1=81=D0=B8=D1=8F=20=D0=9D?=
 =?UTF-8?q?=D0=B8=D0=BA=D0=BE=D0=BB=D0=B0=D0=B5=D0=B2=D0=BD=D0=B0?=
 <a.zelenskaya@svs-tech.pro>
Date: Tue, 25 Jun 2024 16:19:30 +0300
Subject: [PATCH] object

---
 back/frontImages/admin.py  |  5 ++---
 back/frontImages/models.py | 22 ++--------------------
 back/object/admin.py       |  6 +++---
 back/object/models.py      | 28 +++++++++++++++++++++++-----
 4 files changed, 30 insertions(+), 31 deletions(-)

diff --git a/back/frontImages/admin.py b/back/frontImages/admin.py
index 0b4e6dd..21fb74f 100644
--- a/back/frontImages/admin.py
+++ b/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)
\ No newline at end of file
+admin.site.register(Image)
\ No newline at end of file
diff --git a/back/frontImages/models.py b/back/frontImages/models.py
index ec517a1..1e9cc80 100644
--- a/back/frontImages/models.py
+++ b/back/frontImages/models.py
@@ -1,5 +1,4 @@
 from django.db import models
-
 import logging
 
 logger = logging.getLogger("root")
@@ -9,6 +8,7 @@ def group_based_upload_to(instance, filename):
     return "files/image/{}/{}/{}".format(
         type(instance).__name__.lower(), instance.id, filename
     )
+
     
 class Image(models.Model):
     file = models.ImageField(upload_to=group_based_upload_to)
@@ -16,22 +16,4 @@ class Image(models.Model):
     title = models.CharField(max_length=255)
 
     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
\ No newline at end of file
+        return self.title
\ No newline at end of file
diff --git a/back/object/admin.py b/back/object/admin.py
index bf620dd..0b4e6dd 100644
--- a/back/object/admin.py
+++ b/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)
\ No newline at end of file
diff --git a/back/object/models.py b/back/object/models.py
index 5ddc9ce..b836109 100644
--- a/back/object/models.py
+++ b/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
\ No newline at end of file
+        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
\ No newline at end of file