diff --git a/BackEnd_PlanItNow/schema.py b/BackEnd_PlanItNow/schema.py index 62d5169..2a22108 100644 --- a/BackEnd_PlanItNow/schema.py +++ b/BackEnd_PlanItNow/schema.py @@ -1,9 +1,10 @@ import graphene import graphql_jwt -import plans.schema -import users.schema + import friendship.schema +import plans.schema import userprofiles.schema +import users.schema class Query(plans.schema.Query, diff --git a/BackEnd_PlanItNow/settings.py b/BackEnd_PlanItNow/settings.py index 24eee52..bb7c5d4 100644 --- a/BackEnd_PlanItNow/settings.py +++ b/BackEnd_PlanItNow/settings.py @@ -85,7 +85,7 @@ # Database # https://docs.djangoproject.com/en/3.1/ref/settings/#databases -''' + DATABASES = { 'default': { 'ENGINE': 'django.db.backends.sqlite3', @@ -101,6 +101,7 @@ default=config('DATABASE_URL') ) } +''' # Password validation diff --git a/BackEnd_PlanItNow/urls.py b/BackEnd_PlanItNow/urls.py index b7d6cf3..5221a5c 100644 --- a/BackEnd_PlanItNow/urls.py +++ b/BackEnd_PlanItNow/urls.py @@ -16,8 +16,8 @@ from django.contrib import admin from django.urls import path from django.views.decorators.csrf import csrf_exempt - from graphene_django.views import GraphQLView + from BackEnd_PlanItNow.schema import schema urlpatterns = [ diff --git a/db.sqlite3 b/db.sqlite3 index 247a88e..75d6492 100644 Binary files a/db.sqlite3 and b/db.sqlite3 differ diff --git a/friendship/migrations/0001_initial.py b/friendship/migrations/0001_initial.py index 28c79f3..1a9fd7e 100644 --- a/friendship/migrations/0001_initial.py +++ b/friendship/migrations/0001_initial.py @@ -1,7 +1,7 @@ # Generated by Django 3.1.4 on 2021-09-03 19:23 -from django.db import migrations, models import django.db.models.deletion +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/friendship/models.py b/friendship/models.py index fb2c632..f6b91ee 100644 --- a/friendship/models.py +++ b/friendship/models.py @@ -1,7 +1,9 @@ -from userprofiles.models import UserProfile -from django.db import models from enum import Enum +from django.db import models + +from userprofiles.models import UserProfile + class FriendRequestStatus(Enum): """Stores the different friendship request status""" diff --git a/friendship/schema.py b/friendship/schema.py index 9e15b0f..42c0923 100644 --- a/friendship/schema.py +++ b/friendship/schema.py @@ -1,10 +1,9 @@ -from friendship.models import FriendRequest -from friendship.models import FriendRequestStatus -from userprofiles.models import UserProfile - import graphene from graphene_django import DjangoObjectType +from friendship.models import FriendRequest, FriendRequestStatus +from userprofiles.models import UserProfile + class FriendRequestType(DjangoObjectType): class Meta: diff --git a/manage.py b/manage.py index 144eb7c..b36c726 100755 --- a/manage.py +++ b/manage.py @@ -6,15 +6,15 @@ def main(): """Run administrative tasks.""" - os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'BackEnd_PlanItNow.settings') + os.environ.setdefault('DJANGO_SETTINGS_MODULE', + 'BackEnd_PlanItNow.settings') try: from django.core.management import execute_from_command_line except ImportError as exc: raise ImportError( "Couldn't import Django. Are you sure it's installed and " "available on your PYTHONPATH environment variable? Did you " - "forget to activate a virtual environment?" - ) from exc + "forget to activate a virtual environment?") from exc execute_from_command_line(sys.argv) diff --git a/plans/admin.py b/plans/admin.py index 8cf015b..a6b0765 100644 --- a/plans/admin.py +++ b/plans/admin.py @@ -1,5 +1,6 @@ from django.contrib import admin + from plans.models import Plan # Register your models.py here. -admin.site.register(Plan) \ No newline at end of file +admin.site.register(Plan) diff --git a/plans/migrations/0001_initial.py b/plans/migrations/0001_initial.py index 69e3dd6..cda3f19 100644 --- a/plans/migrations/0001_initial.py +++ b/plans/migrations/0001_initial.py @@ -1,8 +1,8 @@ # Generated by Django 3.1.4 on 2021-09-03 19:21 +import django.db.models.deletion from django.conf import settings from django.db import migrations, models -import django.db.models.deletion class Migration(migrations.Migration): diff --git a/plans/models.py b/plans/models.py index aa03342..37cc069 100644 --- a/plans/models.py +++ b/plans/models.py @@ -1,6 +1,7 @@ -from userprofiles.models import UserProfile -from django.db import models from django.contrib.auth import get_user_model +from django.db import models + +from userprofiles.models import UserProfile # PlanModel diff --git a/plans/schema.py b/plans/schema.py index b685938..fc02f7c 100644 --- a/plans/schema.py +++ b/plans/schema.py @@ -1,12 +1,11 @@ -import graphene - from datetime import date + +import graphene +from django.db.models import Q from graphene_django import DjangoObjectType -from plans.models import Plan -from plans.models import PlanParticipation +from plans.models import Plan, PlanParticipation from userprofiles.models import UserProfile -from django.db.models import Q class PlanType(DjangoObjectType): diff --git a/recommendation/migrations/0001_initial.py b/recommendation/migrations/0001_initial.py index 5d83ff0..a69541a 100644 --- a/recommendation/migrations/0001_initial.py +++ b/recommendation/migrations/0001_initial.py @@ -1,7 +1,7 @@ # Generated by Django 3.1.4 on 2021-09-03 19:21 -from django.db import migrations, models import django.db.models.deletion +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/recommendation/models.py b/recommendation/models.py index 9026bf7..8e7077b 100644 --- a/recommendation/models.py +++ b/recommendation/models.py @@ -1,4 +1,5 @@ from django.db import models + from plans.models import Plan from userprofiles.models import UserProfile diff --git a/recommendation/utils.py b/recommendation/utils.py index 71d88eb..371c6d4 100644 --- a/recommendation/utils.py +++ b/recommendation/utils.py @@ -1,29 +1,24 @@ """De momento este utils va a ser una forma de probar scripts. Ya lo cambiaré más adelanteG""" from datetime import date -from deep_translator import GoogleTranslator from deep_translator.exceptions import NotValidPayload -from plans.models import Plan -from recommendation.models import Lemma -from recommendation.models import UserDistance - -from userprofiles.models import UserProfile ### PLN ### -import requests -import numpy as np -import emoji -import regex -import string + import nltk -from collections import Counter -from nltk.corpus import stopwords +from deep_translator import GoogleTranslator + from nltk.corpus import words -from nltk.tokenize import word_tokenize from nltk.stem import WordNetLemmatizer -from nltk.corpus import wordnet as wn +from nltk.tokenize import word_tokenize + +from plans.models import Plan + +### PLN ### +from recommendation.models import Lemma, UserDistance +from userprofiles.models import UserProfile def translate_all_plans(): diff --git a/userprofiles/migrations/0001_initial.py b/userprofiles/migrations/0001_initial.py index 1779aeb..34e0de0 100644 --- a/userprofiles/migrations/0001_initial.py +++ b/userprofiles/migrations/0001_initial.py @@ -1,8 +1,8 @@ # Generated by Django 3.1.4 on 2021-09-03 19:24 +import django.db.models.deletion from django.conf import settings from django.db import migrations, models -import django.db.models.deletion class Migration(migrations.Migration): diff --git a/userprofiles/schema.py b/userprofiles/schema.py index e0188b7..b6b2567 100644 --- a/userprofiles/schema.py +++ b/userprofiles/schema.py @@ -1,8 +1,9 @@ -from userprofiles.models import UserProfile -from django.contrib.auth import get_user_model import graphene +from django.contrib.auth import get_user_model from graphene_django import DjangoObjectType +from userprofiles.models import UserProfile + class UserProfileType(DjangoObjectType): class Meta: diff --git a/users/schema.py b/users/schema.py index 72c2024..f216a2a 100644 --- a/users/schema.py +++ b/users/schema.py @@ -1,10 +1,10 @@ -from django.contrib.auth import get_user_model -from userprofiles.schema import UserProfileType -from userprofiles.models import UserProfile - import graphene +from django.contrib.auth import get_user_model from graphene_django import DjangoObjectType +from userprofiles.models import UserProfile +from userprofiles.schema import UserProfileType + class UserType(DjangoObjectType): class Meta: diff --git a/users/tests/__init__.py b/users/tests/__init__.py new file mode 100644 index 0000000..e69de29