request of Help sucssess

fabricadesoftware-ifc · Aug 5, 2023 · 297486c · 297486c
1 parent 206897e
commit 297486c
Show file tree

Hide file tree

Showing 52 changed files with 514 additions and 206 deletions.
diff --git a/.env-copy b/.env-copy
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -7,7 +7,10 @@
   "python.autoComplete.extraPaths": [
     "${workspaceFolder}/__pypackages__/3.10/lib"
   ],
-  "python.formatting.provider": "black",
+  "python.formatting.provider": "none",
   "python.linting.pylintPath": "${workspaceFolder}/__pypackages__/3.10/bin/pylint",
   "python.formatting.blackPath": "${workspaceFolder}/__pypackages__/3.10/bin/black",
+  "[python]": {
+    "editor.defaultFormatter": "ms-python.black-formatter"
+  },
 }
diff --git a/config/asgi.py b/config/asgi.py
@@ -11,6 +11,6 @@
 
 from django.core.asgi import get_asgi_application
 
-os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'config.settings')
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "config.settings")
 
 application = get_asgi_application()
diff --git a/config/routers.py b/config/routers.py
@@ -8,10 +8,11 @@
     NewsFeelViewSet,
     SaveToReadViewSet,
     CommentsViewSet,
-    ReactionViewSet
+    ReactionViewSet,
+    HelpViewSet,
 )
 
-from user.views import(
+from user.views import (
     UserProjectFollowViewSet,
 )
 
@@ -25,3 +26,4 @@
 router.register(r"savetoread", SaveToReadViewSet)
 router.register(r"reactions", ReactionViewSet)
 router.register(r"comments", CommentsViewSet)
+router.register(r"helps", HelpViewSet)
diff --git a/config/settings.py b/config/settings.py
@@ -29,12 +29,12 @@
 # ALLOWED_HOSTS = []
 
 env = environ.Env()
-environ.Env.read_env((os.path.join(BASE_DIR, '.env')))
+environ.Env.read_env((os.path.join(BASE_DIR, ".env")))
 
-SECRET_KEY = env('SECRET_KEY')
-DEBUG = env('DEBUG')
-ALLOWED_HOSTS = env('ALLOWED_HOSTS').split(',')
-DATABASES = {'default': env.db()}
+SECRET_KEY = env("SECRET_KEY")
+DEBUG = env("DEBUG")
+ALLOWED_HOSTS = env("ALLOWED_HOSTS").split(",")
+DATABASES = {"default": env.db()}
 
 # Application definition
 
@@ -45,6 +45,7 @@
     "django.contrib.sessions",
     "django.contrib.messages",
     "django.contrib.staticfiles",
+    "corsheaders",
     "rest_framework",
     "core",
     "user",
@@ -54,6 +55,7 @@
 MIDDLEWARE = [
     "django.middleware.security.SecurityMiddleware",
     "django.contrib.sessions.middleware.SessionMiddleware",
+    "corsheaders.middleware.CorsMiddleware",
     "django.middleware.common.CommonMiddleware",
     "django.middleware.csrf.CsrfViewMiddleware",
     "django.contrib.auth.middleware.AuthenticationMiddleware",
@@ -133,3 +135,5 @@
 # https://docs.djangoproject.com/en/4.2/ref/settings/#default-auto-field
 
 DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField"
+
+CORS_ALLOW_ALL_ORIGINS = True
diff --git a/config/wsgi.py b/config/wsgi.py
@@ -11,6 +11,6 @@
 
 from django.core.wsgi import get_wsgi_application
 
-os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'config.settings')
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "config.settings")
 
 application = get_wsgi_application()
diff --git a/core/admin.py b/core/admin.py
@@ -9,6 +9,7 @@
     Favorites,
     Reaction,
     SaveToRead,
+    Help,
 )
 
 from user.models import (
@@ -33,3 +34,4 @@
 admin.site.register(SaveToRead)
 admin.site.register(Project)
 admin.site.register(UserProjectFollow)
+admin.site.register(Help)
diff --git a/core/apps.py b/core/apps.py
@@ -2,5 +2,5 @@
 
 
 class CoreConfig(AppConfig):
-    default_auto_field = 'django.db.models.BigAutoField'
-    name = 'core'
+    default_auto_field = "django.db.models.BigAutoField"
+    name = "core"
diff --git a/core/migrations/0001_initial.py b/core/migrations/0001_initial.py
@@ -4,18 +4,24 @@
 
 
 class Migration(migrations.Migration):
-
     initial = True
 
-    dependencies = [
-    ]
+    dependencies = []
 
     operations = [
         migrations.CreateModel(
-            name='Category',
+            name="Category",
             fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('description', models.CharField(max_length=50)),
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("description", models.CharField(max_length=50)),
             ],
         ),
     ]
diff --git a/core/migrations/0002_feeling.py b/core/migrations/0002_feeling.py
@@ -4,18 +4,25 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('core', '0001_initial'),
+        ("core", "0001_initial"),
     ]
 
     operations = [
         migrations.CreateModel(
-            name='Feeling',
+            name="Feeling",
             fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('description', models.CharField(max_length=50)),
-                ('emoji', models.CharField(max_length=300)),
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("description", models.CharField(max_length=50)),
+                ("emoji", models.CharField(max_length=300)),
             ],
         ),
     ]
diff --git a/core/migrations/0002_user.py b/core/migrations/0002_user.py
@@ -4,17 +4,24 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('core', '0001_initial'),
+        ("core", "0001_initial"),
     ]
 
     operations = [
         migrations.CreateModel(
-            name='User',
+            name="User",
             fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(max_length=100)),
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("name", models.CharField(max_length=100)),
             ],
         ),
     ]
diff --git a/core/migrations/0003_merge_0002_feeling_0002_user.py b/core/migrations/0003_merge_0002_feeling_0002_user.py
@@ -4,11 +4,9 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('core', '0002_feeling'),
-        ('core', '0002_user'),
+        ("core", "0002_feeling"),
+        ("core", "0002_user"),
     ]
 
-    operations = [
-    ]
+    operations = []
diff --git a/core/migrations/0004_alter_category_description_news.py b/core/migrations/0004_alter_category_description_news.py
@@ -5,35 +5,56 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('core', '0003_merge_0002_feeling_0002_user'),
+        ("core", "0003_merge_0002_feeling_0002_user"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='category',
-            name='description',
-            field=models.CharField(blank='False', max_length=50, null='False'),
+            model_name="category",
+            name="description",
+            field=models.CharField(blank="False", max_length=50, null="False"),
         ),
         migrations.CreateModel(
-            name='News',
+            name="News",
             fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('title', models.CharField(max_length=200)),
-                ('text', models.CharField(max_length=5000)),
-                ('date_pub', models.DateField()),
-                ('public', models.BooleanField()),
-                ('tags', models.JSONField()),
-                ('revision_date', models.DateTimeField()),
-                ('status', models.CharField(max_length=20)),
-                ('needs_revision', models.BooleanField()),
-                ('needs_approval', models.BooleanField()),
-                ('relevance', models.IntegerField()),
-                ('accuracy', models.IntegerField()),
-                ('update_date', models.DateTimeField()),
-                ('category_id', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='News', to='core.category')),
-                ('user_pub_id', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='News', to='core.user')),
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("title", models.CharField(max_length=200)),
+                ("text", models.CharField(max_length=5000)),
+                ("date_pub", models.DateField()),
+                ("public", models.BooleanField()),
+                ("tags", models.JSONField()),
+                ("revision_date", models.DateTimeField()),
+                ("status", models.CharField(max_length=20)),
+                ("needs_revision", models.BooleanField()),
+                ("needs_approval", models.BooleanField()),
+                ("relevance", models.IntegerField()),
+                ("accuracy", models.IntegerField()),
+                ("update_date", models.DateTimeField()),
+                (
+                    "category_id",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.PROTECT,
+                        related_name="News",
+                        to="core.category",
+                    ),
+                ),
+                (
+                    "user_pub_id",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.PROTECT,
+                        related_name="News",
+                        to="core.user",
+                    ),
+                ),
             ],
         ),
     ]
diff --git a/core/migrations/0005_comments_newsfeel_delete_news.py b/core/migrations/0005_comments_newsfeel_delete_news.py
@@ -5,7 +5,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("core", "0004_alter_category_description_news"),
     ]

diff --git a/core/migrations/0006_news.py b/core/migrations/0006_news.py
@@ -5,7 +5,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("core", "0005_comments_newsfeel_delete_news"),
     ]

diff --git a/core/migrations/0007_userinteractions.py b/core/migrations/0007_userinteractions.py
@@ -5,22 +5,43 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('core', '0006_news'),
+        ("core", "0006_news"),
     ]
 
     operations = [
         migrations.CreateModel(
-            name='UserInteractions',
+            name="UserInteractions",
             fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('interaction_type', models.CharField(max_length=20)),
-                ('interaction_time', models.DateTimeField(auto_now_add=True)),
-                ('has_notification', models.BooleanField(default=False)),
-                ('created_at', models.DateTimeField(auto_now_add=True)),
-                ('category', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='UserInteractions', to='core.category')),
-                ('user', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='UserInteractions', to='core.user')),
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("interaction_type", models.CharField(max_length=20)),
+                ("interaction_time", models.DateTimeField(auto_now_add=True)),
+                ("has_notification", models.BooleanField(default=False)),
+                ("created_at", models.DateTimeField(auto_now_add=True)),
+                (
+                    "category",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.PROTECT,
+                        related_name="UserInteractions",
+                        to="core.category",
+                    ),
+                ),
+                (
+                    "user",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.PROTECT,
+                        related_name="UserInteractions",
+                        to="core.user",
+                    ),
+                ),
             ],
         ),
     ]
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,6 @@ @@
     class Migration(migrations.Migration):
         dependencies = [
             ("core", "0004_alter_category_description_news"),
         ]
@@ Expand Down @@