Added a many-to-many relationship between Language and User

ykdojo · Dec 11, 2018 · 1a9fdfa · 1a9fdfa
1 parent 0a2f3a3
commit 1a9fdfa
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 4 deletions.
diff --git a/users/migrations/0003_auto_20181211_2211.py b/users/migrations/0003_auto_20181211_2211.py
@@ -0,0 +1,23 @@
+# Generated by Django 2.1.2 on 2018-12-11 22:11
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('users', '0002_language'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='customuser',
+            name='fluent_languages',
+            field=models.ManyToManyField(related_name='fluent_users', to='users.Language'),
+        ),
+        migrations.AddField(
+            model_name='customuser',
+            name='learning_languages',
+            field=models.ManyToManyField(related_name='learning_users', to='users.Language'),
+        ),
+    ]
diff --git a/users/models.py b/users/models.py
@@ -4,9 +4,6 @@
 class CustomUserManager(UserManager):
     pass
 
-class CustomUser(AbstractUser):
-    objects = CustomUserManager()
-
 class Language(models.Model):
     # Representation of this language in English.
     # For example, "Japanese" or "Spanish".
@@ -21,4 +18,9 @@ def __str__(self):
         return self.english_representation
 
     class Meta:
-        ordering = ('english_representation',)
+        ordering = ('english_representation',)
+
+class CustomUser(AbstractUser):
+    objects = CustomUserManager()
+    learning_languages = models.ManyToManyField(Language, related_name="learning_users")
+    fluent_languages = models.ManyToManyField(Language, related_name="fluent_users")