refactors, fixes

dev.txt

@@ -1,3 +1,3 @@
 docker-compose up
-docker build -t payrolsystem .
+docker build -t conshareapi3.0 .
 docker-compose -f docker-compose.yml up

users/migrations/0003_remove_userprofile_certifications_and_more.py

@@ -0,0 +1,64 @@
+# Generated by Django 4.0 on 2024-03-03 11:19
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('users', '0002_alter_userrefer_options_remove_userrefer_caption_and_more'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='userprofile',
+            name='certifications',
+        ),
+        migrations.AddField(
+            model_name='userprofile',
+            name='certifications',
+            field=models.ForeignKey(blank=True, default=0, on_delete=django.db.models.deletion.CASCADE, related_name='licenses', to='users.certificationtag'),
+            preserve_default=False,
+        ),
+        migrations.RemoveField(
+            model_name='userprofile',
+            name='education',
+        ),
+        migrations.AddField(
+            model_name='userprofile',
+            name='education',
+            field=models.ForeignKey(blank=True, default=0, on_delete=django.db.models.deletion.CASCADE, related_name='schools', to='users.educationtag'),
+            preserve_default=False,
+        ),
+        migrations.RemoveField(
+            model_name='userprofile',
+            name='interests',
+        ),
+        migrations.AddField(
+            model_name='userprofile',
+            name='interests',
+            field=models.ForeignKey(blank=True, default=0, on_delete=django.db.models.deletion.CASCADE, related_name='topic_interests', to='users.interesttag'),
+            preserve_default=False,
+        ),
+        migrations.RemoveField(
+            model_name='userprofile',
+            name='jobs',
+        ),
+        migrations.AddField(
+            model_name='userprofile',
+            name='jobs',
+            field=models.ForeignKey(blank=True, default=0, on_delete=django.db.models.deletion.CASCADE, related_name='jobs_done', to='users.experiencetag'),
+            preserve_default=False,
+        ),
+        migrations.RemoveField(
+            model_name='userprofile',
+            name='skills',
+        ),
+        migrations.AddField(
+            model_name='userprofile',
+            name='skills',
+            field=models.ForeignKey(blank=True, default=0, on_delete=django.db.models.deletion.CASCADE, related_name='personal_skills', to='users.skilltag'),
+            preserve_default=False,
+        ),
+    ]

users/models.py

@@ -17,7 +17,7 @@ def __str__(self):
         return self.name
 
 
-# Skills are added by teh user to indicate topics they are proficient in
+# Skills are added by teh user to indicate skills they are proficient in
 class SkillTag(models.Model):
     name = models.CharField(primary_key=True, max_length=150, null=False, blank=False)
 
@@ -83,11 +83,11 @@ class UserProfile(models.Model):
     city = models.CharField(max_length=100)
     vote_ratio = models.IntegerField(blank=True, null=True, default=0)
     followers_count = models.IntegerField(blank=True, null=True, default=0)
-    skills = models.ManyToManyField(SkillTag, related_name='personal_skills', blank=True)
-    interests = models.ManyToManyField(InterestTag, related_name='topic_interests', blank=True)
-    certifications = models.ManyToManyField(CertificationTag, related_name='licenses', blank=True)
-    jobs = models.ManyToManyField(ExperienceTag, related_name='jobs_done', blank=True)
-    education = models.ManyToManyField(EducationTag, related_name='schools', blank=True)
+    skills = models.ForeignKey(SkillTag, related_name='personal_skills', blank=True,  on_delete=models.CASCADE)
+    interests = models.ForeignKey(InterestTag, related_name='topic_interests', blank=True,  on_delete=models.CASCADE)
+    certifications = models.ForeignKey(CertificationTag, related_name='licenses', blank=True,  on_delete=models.CASCADE)
+    jobs = models.ForeignKey(ExperienceTag, related_name='jobs_done', blank=True,  on_delete=models.CASCADE)
+    education = models.ForeignKey(EducationTag, related_name='schools', blank=True,  on_delete=models.CASCADE)
     followers = models.ManyToManyField(User, related_name='following', blank=True)
     email_verified = models.BooleanField(default=False)
     id = models.UUIDField(default=uuid.uuid4,  unique=True, primary_key=True, editable=False)