Replace deprecated django-update-from-dict package (#42)

CAPTxTreeckle · Sep 17, 2024 · 55ae322 · 55ae322
1 parent a35bd5e
commit 55ae322
Show file tree

Hide file tree

Showing 15 changed files with 25 additions and 38 deletions.
diff --git a/backend/requirements.txt b/backend/requirements.txt
@@ -7,7 +7,6 @@ psycopg2-binary==2.9.1
 python-dotenv==0.19.0
 django-anymail[sendinblue]==8.4
 djangorestframework-camel-case
-django-update-from-dict
 django-cors-headers
 django-jazzmin
 django[argon2]

diff --git a/backend/treeckle/authentication/migrations/0001_initial.py b/backend/treeckle/authentication/migrations/0001_initial.py
@@ -2,7 +2,6 @@
 
 from django.db import migrations, models
 import django.db.models.deletion
-import django_update_from_dict
 
 
 class Migration(migrations.Migration):
@@ -26,6 +25,6 @@ class Migration(migrations.Migration):
             options={
                 'abstract': False,
             },
-            bases=(django_update_from_dict.UpdateFromDictMixin, models.Model),
+            bases=(models.Model,),
         ),
     ]
diff --git a/backend/treeckle/authentication/migrations/0002_openidauthentication.py b/backend/treeckle/authentication/migrations/0002_openidauthentication.py
@@ -2,7 +2,6 @@
 
 from django.db import migrations, models
 import django.db.models.deletion
-import django_update_from_dict
 
 
 class Migration(migrations.Migration):
@@ -25,6 +24,6 @@ class Migration(migrations.Migration):
             options={
                 'abstract': False,
             },
-            bases=(django_update_from_dict.UpdateFromDictMixin, models.Model),
+            bases=(models.Model,),
         ),
     ]
diff --git a/backend/treeckle/authentication/migrations/0003_auto_20210709_1926.py b/backend/treeckle/authentication/migrations/0003_auto_20210709_1926.py
@@ -2,7 +2,6 @@
 
 from django.db import migrations, models
 import django.db.models.deletion
-import django_update_from_dict
 
 
 class Migration(migrations.Migration):
@@ -35,6 +34,6 @@ class Migration(migrations.Migration):
             options={
                 'abstract': False,
             },
-            bases=(django_update_from_dict.UpdateFromDictMixin, models.Model),
+            bases=(models.Model,),
         ),
     ]
diff --git a/backend/treeckle/authentication/migrations/0005_facebookauthentication.py b/backend/treeckle/authentication/migrations/0005_facebookauthentication.py
@@ -2,7 +2,6 @@
 
 from django.db import migrations, models
 import django.db.models.deletion
-import django_update_from_dict
 
 
 class Migration(migrations.Migration):
@@ -25,6 +24,6 @@ class Migration(migrations.Migration):
             options={
                 'abstract': False,
             },
-            bases=(django_update_from_dict.UpdateFromDictMixin, models.Model),
+            bases=(models.Model,),
         ),
     ]
diff --git a/backend/treeckle/bookings/migrations/0001_initial.py b/backend/treeckle/bookings/migrations/0001_initial.py
@@ -3,7 +3,6 @@
 from django.db import migrations, models
 import django.db.models.deletion
 import django.db.models.expressions
-import django_update_from_dict
 
 
 class Migration(migrations.Migration):
@@ -32,7 +31,7 @@ class Migration(migrations.Migration):
             options={
                 'ordering': ['-created_at'],
             },
-            bases=(django_update_from_dict.UpdateFromDictMixin, models.Model),
+            bases=(models.Model,),
         ),
         migrations.AddConstraint(
             model_name='booking',

diff --git a/backend/treeckle/comments/migrations/0001_initial.py b/backend/treeckle/comments/migrations/0001_initial.py
@@ -2,7 +2,6 @@
 
 from django.db import migrations, models
 import django.db.models.deletion
-import django_update_from_dict
 
 
 class Migration(migrations.Migration):
@@ -27,7 +26,7 @@ class Migration(migrations.Migration):
             options={
                 'ordering': ['-created_at'],
             },
-            bases=(django_update_from_dict.UpdateFromDictMixin, models.Model),
+            bases=(models.Model,),
         ),
         migrations.CreateModel(
             name='CommentRead',
@@ -38,7 +37,7 @@ class Migration(migrations.Migration):
                 ('comment', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='comments.comment')),
                 ('reader', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='users.user')),
             ],
-            bases=(django_update_from_dict.UpdateFromDictMixin, models.Model),
+            bases=(models.Model,),
         ),
         migrations.CreateModel(
             name='BookingComment',

diff --git a/backend/treeckle/content_delivery_service/migrations/0001_initial.py b/backend/treeckle/content_delivery_service/migrations/0001_initial.py
@@ -1,7 +1,6 @@
 # Generated by Django 3.2.5 on 2021-07-28 07:56
 
 from django.db import migrations, models
-import django_update_from_dict
 
 
 class Migration(migrations.Migration):
@@ -24,6 +23,6 @@ class Migration(migrations.Migration):
             options={
                 'abstract': False,
             },
-            bases=(django_update_from_dict.UpdateFromDictMixin, models.Model),
+            bases=(models.Model,),
         ),
     ]
diff --git a/backend/treeckle/events/migrations/0001_initial.py b/backend/treeckle/events/migrations/0001_initial.py
@@ -3,7 +3,6 @@
 import django.core.validators
 from django.db import migrations, models
 import django.db.models.deletion
-import django_update_from_dict
 
 
 class Migration(migrations.Migration):
@@ -38,7 +37,7 @@ class Migration(migrations.Migration):
             options={
                 'ordering': ['-created_at'],
             },
-            bases=(django_update_from_dict.UpdateFromDictMixin, models.Model),
+            bases=(models.Model,),
         ),
         migrations.CreateModel(
             name='EventCategoryType',
@@ -52,7 +51,7 @@ class Migration(migrations.Migration):
             options={
                 'ordering': ['name'],
             },
-            bases=(django_update_from_dict.UpdateFromDictMixin, models.Model),
+            bases=(models.Model,),
         ),
         migrations.CreateModel(
             name='EventSignUp',
@@ -67,7 +66,7 @@ class Migration(migrations.Migration):
             options={
                 'ordering': ['-status', 'created_at'],
             },
-            bases=(django_update_from_dict.UpdateFromDictMixin, models.Model),
+            bases=(models.Model,),
         ),
         migrations.CreateModel(
             name='EventCategoryTypeSubscription',
@@ -78,7 +77,7 @@ class Migration(migrations.Migration):
                 ('category', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='events.eventcategorytype')),
                 ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='users.user')),
             ],
-            bases=(django_update_from_dict.UpdateFromDictMixin, models.Model),
+            bases=(models.Model,),
         ),
         migrations.CreateModel(
             name='EventCategory',
@@ -89,7 +88,7 @@ class Migration(migrations.Migration):
                 ('category', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='events.eventcategorytype')),
                 ('event', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='events.event')),
             ],
-            bases=(django_update_from_dict.UpdateFromDictMixin, models.Model),
+            bases=(models.Model,),
         ),
         migrations.AddConstraint(
             model_name='eventsignup',

diff --git a/backend/treeckle/organizations/migrations/0001_initial.py b/backend/treeckle/organizations/migrations/0001_initial.py
@@ -1,7 +1,6 @@
 # Generated by Django 3.1.3 on 2020-12-23 09:50
 
 from django.db import migrations, models
-import django_update_from_dict
 
 
 class Migration(migrations.Migration):
@@ -23,6 +22,6 @@ class Migration(migrations.Migration):
             options={
                 'ordering': ['name'],
             },
-            bases=(django_update_from_dict.UpdateFromDictMixin, models.Model),
+            bases=(models.Model,),
         ),
     ]
diff --git a/backend/treeckle/organizations/migrations/0002_auto_20201223_1002.py b/backend/treeckle/organizations/migrations/0002_auto_20201223_1002.py
@@ -2,7 +2,6 @@
 
 from django.db import migrations, models
 import django.db.models.deletion
-import django_update_from_dict
 
 
 class Migration(migrations.Migration):
@@ -25,7 +24,7 @@ class Migration(migrations.Migration):
             options={
                 'ordering': ['name'],
             },
-            bases=(django_update_from_dict.UpdateFromDictMixin, models.Model),
+            bases=(models.Model,),
         ),
         migrations.AddConstraint(
             model_name='organizationlistener',

diff --git a/backend/treeckle/treeckle/common/models.py b/backend/treeckle/treeckle/common/models.py
@@ -1,11 +1,12 @@
 from django.db import models
 
-from django_update_from_dict import UpdateFromDictMixin
-
-
-class TimestampedModel(UpdateFromDictMixin, models.Model):
+class TimestampedModel(models.Model):
     created_at = models.DateTimeField(auto_now_add=True)
     updated_at = models.DateTimeField(auto_now=True)
 
     class Meta:
-        abstract = True
+        abstract = True
+
+    def update_from_dict(self, update_dict):
+        for field, value in update_dict.items():
+            setattr(self, field, value)
diff --git a/backend/treeckle/users/migrations/0009_gmailauthentication.py b/backend/treeckle/users/migrations/0009_gmailauthentication.py
@@ -2,7 +2,6 @@
 
 from django.db import migrations, models
 import django.db.models.deletion
-import django_update_from_dict
 
 
 class Migration(migrations.Migration):
@@ -24,6 +23,6 @@ class Migration(migrations.Migration):
             options={
                 'abstract': False,
             },
-            bases=(django_update_from_dict.UpdateFromDictMixin, models.Model),
+            bases=(models.Model,),
         ),
     ]
diff --git a/backend/treeckle/venues/migrations/0001_initial.py b/backend/treeckle/venues/migrations/0001_initial.py
@@ -2,7 +2,6 @@
 
 from django.db import migrations, models
 import django.db.models.deletion
-import django_update_from_dict
 
 
 class Migration(migrations.Migration):
@@ -26,7 +25,7 @@ class Migration(migrations.Migration):
             options={
                 'ordering': ['name'],
             },
-            bases=(django_update_from_dict.UpdateFromDictMixin, models.Model),
+            bases=(models.Model,),
         ),
         migrations.CreateModel(
             name='Venue',
@@ -46,7 +45,7 @@ class Migration(migrations.Migration):
             options={
                 'ordering': ['name'],
             },
-            bases=(django_update_from_dict.UpdateFromDictMixin, models.Model),
+            bases=(models.Model,),
         ),
         migrations.AddConstraint(
             model_name='venuecategory',

diff --git a/backend/treeckle/venues/migrations/0016_auto_20210706_1742.py b/backend/treeckle/venues/migrations/0016_auto_20210706_1742.py
@@ -2,7 +2,6 @@
 
 from django.db import migrations, models
 import django.db.models.deletion
-import django_update_from_dict
 
 
 class Migration(migrations.Migration):
@@ -22,7 +21,7 @@ class Migration(migrations.Migration):
                 ('email', models.EmailField(max_length=254)),
                 ('venue', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='venues.venue')),
             ],
-            bases=(django_update_from_dict.UpdateFromDictMixin, models.Model),
+            bases=(models.Model,),
         ),
         migrations.AddConstraint(
             model_name='venuebookingnotificationsubscription',