From 91381920e09dfc38aaae29c61d3d92adae7b012b Mon Sep 17 00:00:00 2001
From: mtyton <mateusz.tyton99@gmail.com>
Date: Mon, 11 Sep 2023 21:46:50 +0200
Subject: [PATCH] fixed migrations issues

---
 artel/docker-compose-test.yml                        |  5 +++--
 artel/store/migrations/0013_merge_20230808_0030.py   | 12 ------------
 ....py => 0014_alter_productimage_image_and_more.py} | 10 ++++++++--
 3 files changed, 11 insertions(+), 16 deletions(-)
 delete mode 100644 artel/store/migrations/0013_merge_20230808_0030.py
 rename artel/store/migrations/{0007_alter_productimage_image.py => 0014_alter_productimage_image_and_more.py} (51%)

diff --git a/artel/docker-compose-test.yml b/artel/docker-compose-test.yml
index f44132b..a5275b0 100644
--- a/artel/docker-compose-test.yml
+++ b/artel/docker-compose-test.yml
@@ -22,8 +22,9 @@ services:
     volumes:
       - ./:/app
     environment:
-      - SECRET_KEY
-      - DATABASE_URL
+      - SECRET_KEY=RandomKey
+      - DATABASE_URL=postgres://comfy:password@test_db/comfy_shop
+      - DJANGO_SETTINGS_MODULE=artel.settings.tests
     env_file:
       - .env
     command:
diff --git a/artel/store/migrations/0013_merge_20230808_0030.py b/artel/store/migrations/0013_merge_20230808_0030.py
deleted file mode 100644
index 10a67cd..0000000
--- a/artel/store/migrations/0013_merge_20230808_0030.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# Generated by Django 4.1.10 on 2023-08-08 00:30
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ("store", "0007_alter_productimage_image"),
-        ("store", "0012_deliverymethod_order_uuid_product_uuid_and_more"),
-    ]
-
-    operations = []
diff --git a/artel/store/migrations/0007_alter_productimage_image.py b/artel/store/migrations/0014_alter_productimage_image_and_more.py
similarity index 51%
rename from artel/store/migrations/0007_alter_productimage_image.py
rename to artel/store/migrations/0014_alter_productimage_image_and_more.py
index 12d6eee..c4ed3ed 100644
--- a/artel/store/migrations/0007_alter_productimage_image.py
+++ b/artel/store/migrations/0014_alter_productimage_image_and_more.py
@@ -1,4 +1,4 @@
-# Generated by Django 4.1.10 on 2023-08-04 03:05
+# Generated by Django 4.1.10 on 2023-09-09 16:42
 
 from django.db import migrations
 import easy_thumbnails.fields
@@ -6,7 +6,7 @@ import easy_thumbnails.fields
 
 class Migration(migrations.Migration):
     dependencies = [
-        ("store", "0006_remove_orderdocument_sent"),
+        ("store", "0013_producttemplateparam_alter_product_params_and_more"),
     ]
 
     operations = [
@@ -15,4 +15,10 @@ class Migration(migrations.Migration):
             name="image",
             field=easy_thumbnails.fields.ThumbnailerImageField(upload_to=""),
         ),
+        migrations.AlterField(
+            model_name="producttemplateimage",
+            name="image",
+            field=easy_thumbnails.fields.ThumbnailerImageField(upload_to=""),
+        )
     ]
+    
\ No newline at end of file