From ae51461fd316e20db8b16654ebf652d541de7c22 Mon Sep 17 00:00:00 2001 From: makkahwi Date: Tue, 5 Jul 2022 20:48:57 +0300 Subject: [PATCH 01/13] Deploy Attemp --- docker-compose.yml | 5 ++-- pyproject.toml | 5 +++- requirements.txt | 5 +++- tadreebi/settings.py | 66 +++++++++++++++++++++++++++++++++----------- 4 files changed, 61 insertions(+), 20 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index ed33de7..9387b34 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,13 +4,14 @@ services: web: build: . command: python manage.py runserver 0.0.0.0:8000 + # command: gunicorn tadreebi.wsgi:application --bind 0.0.0.0:8000 --workers 4 volumes: - .:/code ports: - "8000:8000" depends_on: - database - + database: image: postgres environment: @@ -28,4 +29,4 @@ services: links: - database ports: - - 8082:80 \ No newline at end of file + - 8082:80 diff --git a/pyproject.toml b/pyproject.toml index 3e64e85..c793c2a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -15,8 +15,11 @@ djangorestframework-simplejwt = "^5.2.0" django-location-field = "^2.1.0" Pillow = "^9.1.1" drf-yasg = {extras = ["validation"], version = "^1.20.0"} -python-dotenv = "^0.20.0" django-cors-headers = "^3.13.0" +whitenoise = "^6.2.0" +psycopg2-binary = "^2.9.3" +gunicorn = "^20.1.0" +django-environ = "^0.9.0" [tool.poetry.dev-dependencies] pytest = "^5.2" diff --git a/requirements.txt b/requirements.txt index a473694..71a1771 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,6 +5,7 @@ charset-normalizer==2.0.12; python_version >= "3.7" and python_version < "4" and coreapi==2.3.3; python_version >= "3.6" coreschema==0.0.4; python_version >= "3.6" django-cors-headers==3.13.0; python_version >= "3.7" +django-environ==0.9.0; python_version >= "3.4" and python_version < "4" django-filter==22.1; python_version >= "3.7" django-location-field==2.1.0 django-phonenumber-field==6.3.0; python_version >= "3.7" @@ -12,6 +13,7 @@ django==4.0.5; python_version >= "3.8" djangorestframework-simplejwt==5.2.0; python_version >= "3.7" djangorestframework==3.13.1; python_version >= "3.6" drf-yasg==1.20.0; python_version >= "3.6" +gunicorn==20.1.0; python_version >= "3.5" idna==3.3; python_version >= "3.7" and python_version < "4" inflection==0.5.1; python_version >= "3.6" itypes==1.2.0; python_version >= "3.6" @@ -22,10 +24,10 @@ markupsafe==2.1.1; python_version >= "3.7" packaging==21.3; python_version >= "3.6" phonenumbers==8.12.50; python_version >= "3.7" pillow==9.1.1; python_version >= "3.7" +psycopg2-binary==2.9.3; python_version >= "3.6" pyjwt==2.4.0; python_version >= "3.7" pyparsing==3.0.9; python_full_version >= "3.6.8" and python_version >= "3.6" pyrsistent==0.18.1; python_version >= "3.7" -python-dotenv==0.20.0; python_version >= "3.5" pytz==2022.1; python_version >= "3.7" pyyaml==6.0; python_version >= "3.6" requests==2.28.0; python_version >= "3.7" and python_version < "4" @@ -37,3 +39,4 @@ swagger-spec-validator==2.7.4; python_version >= "3.6" tzdata==2022.1; sys_platform == "win32" and python_version >= "3.8" uritemplate==4.1.1; python_version >= "3.6" urllib3==1.26.9; python_version >= "3.7" and python_full_version < "3.0.0" and python_version < "4" or python_full_version >= "3.5.0" and python_version < "4" and python_version >= "3.7" +whitenoise==6.2.0; python_version >= "3.7" diff --git a/tadreebi/settings.py b/tadreebi/settings.py index 8858db2..2b5840b 100644 --- a/tadreebi/settings.py +++ b/tadreebi/settings.py @@ -12,26 +12,52 @@ from pathlib import Path import os -import dotenv +import environ from django.conf import settings # Build paths inside the project like this: BASE_DIR / 'subdir'. BASE_DIR = Path(__file__).resolve().parent.parent +env = environ.Env( + ALLOWED_HOSTS=(list, []), + DEBUG=(bool, False), + ENVIRONMENT=(str, "PRODUCTION"), + SECRET_KEY=(str, ""), + ALLOW_ALL_ORIGINS=(bool, False), + ALLOWED_ORIGINS=(list, []), + DATABASE_ENGINE=(str, "django.db.backends.sqlite3"), + DATABASE_NAME=(str, BASE_DIR / "db.sqlite3"), + DATABASE_USER=(str, ""), + DATABASE_PASSWORD=(str, ""), + DATABASE_HOST=(str, ""), + DATABASE_PORT=(int, 5432), + CSRF_TRUSTED_ORIGINS=(list, []), + ALLOW_METHODS=(list, []), + ALLOW_HEADERS=(list, []), + CORS_ORIGIN_WHITELIST=(list, []), + CORS_ALLOW_ALL_ORIGINS=(bool, False), +) + +environ.Env.read_env() + +ENVIRONMENT = env.str("ENVIRONMENT") + + # Quick-start development settings - unsuitable for production # See https://docs.djangoproject.com/en/4.0/howto/deployment/checklist/ # To read the .env file -dotenv.load_dotenv() +# dotenv.load_dotenv() # SECURITY WARNING: keep the secret key used in production secret! -SECRET_KEY = os.environ.get("SECRET_KEY") +SECRET_KEY = env.str("SECRET_KEY") # SECURITY WARNING: don't run with debug turned on in production! -DEBUG = os.environ.get("DEBUG") == "True" +ALLOWED_HOSTS = tuple(env.list("ALLOWED_HOSTS")) +DEBUG = env.bool("DEBUG") + -ALLOWED_HOSTS = ["*"] # Application definition @@ -58,6 +84,7 @@ MIDDLEWARE = [ "django.middleware.security.SecurityMiddleware", + "whitenoise.middleware.WhiteNoiseMiddleware", "corsheaders.middleware.CorsMiddleware", "django.contrib.sessions.middleware.SessionMiddleware", "django.middleware.common.CommonMiddleware", @@ -95,7 +122,15 @@ "default": { "ENGINE": "django.db.backends.sqlite3", "NAME": BASE_DIR / "db.sqlite3", - } + }, + # "postgresql": { + # "DATABASE_ENGINE": env.str("DATABASE_ENGINE"), + # "DATABASE_NAME": env.str("DATABASE_NAME"), + # "DATABASE_USER": env.str("DATABASE_USER"), + # "DATABASE_PASSWORD": env.str("DATABASE_PASSWORD"), + # "DATABASE_HOST": env.str("DATABASE_HOST"), + # "DATABASE_PORT": env.str("DATABASE_PORT"), + # }, } @@ -142,6 +177,8 @@ # https://docs.djangoproject.com/en/4.0/howto/static-files/ STATIC_URL = "/static/" +STATIC_ROOT = BASE_DIR / "staticfiles" + # Default primary key field type # https://docs.djangoproject.com/en/4.0/ref/settings/#default-auto-field @@ -195,8 +232,7 @@ # To change the default redirection after login/logout LOGIN_REDIRECT_URL = "/" LOGOUT_REDIRECT_URL = "/api-auth/login/" -# ACCOUNT_LOGOUT_REDIRECT_URL = "/api-auth/login/" -# LOGOUT_URL = "/api-auth/login/" + # To save the sent emails in the database EMAIL_BACKEND = "django.core.mail.backends.filebased.EmailBackend" @@ -207,11 +243,9 @@ # "VALIDATOR_URL": "http://localhost:8000", # } -CORS_ORIGIN_WHITELIST = tuple( - [ - "http://localhost:3000", - "http://localhost:8000", - "http://localhost:8080", - ] -) -CORS_ALLOW_ALL_ORIGINS = True + +CORS_ALLOW_ALL_ORIGINS = env.bool("CORS_ALLOW_ALL_ORIGINS") +CORS_ALLOW_METHODS = env.list("ALLOW_METHODS") +CORS_ALLOW_HEADERS = env.list("ALLOW_HEADERS") + +CSRF_TRUSTED_ORIGINS = tuple(env.list("CSRF_TRUSTED_ORIGINS")) From efd49d581692f70daf955201c8f7bddf4a53c6f1 Mon Sep 17 00:00:00 2001 From: emad-almajdalawi Date: Tue, 5 Jul 2022 21:56:12 +0300 Subject: [PATCH 02/13] working now --- requirements.txt | 12 ++++++------ tadreebi/settings.py | 17 ++++++++++------- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/requirements.txt b/requirements.txt index 71a1771..7234cb5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ asgiref==3.5.2; python_version >= "3.8" attrs==21.4.0; python_version >= "3.7" and python_full_version < "3.0.0" or python_version >= "3.7" and python_full_version >= "3.5.0" certifi==2022.6.15; python_version >= "3.7" and python_version < "4" -charset-normalizer==2.0.12; python_version >= "3.7" and python_version < "4" and python_full_version >= "3.5.0" +charset-normalizer==2.1.0; python_version >= "3.7" and python_version < "4" and python_full_version >= "3.6.0" coreapi==2.3.3; python_version >= "3.6" coreschema==0.0.4; python_version >= "3.6" django-cors-headers==3.13.0; python_version >= "3.7" @@ -9,7 +9,7 @@ django-environ==0.9.0; python_version >= "3.4" and python_version < "4" django-filter==22.1; python_version >= "3.7" django-location-field==2.1.0 django-phonenumber-field==6.3.0; python_version >= "3.7" -django==4.0.5; python_version >= "3.8" +django==4.0.6; python_version >= "3.8" djangorestframework-simplejwt==5.2.0; python_version >= "3.7" djangorestframework==3.13.1; python_version >= "3.6" drf-yasg==1.20.0; python_version >= "3.6" @@ -18,19 +18,19 @@ idna==3.3; python_version >= "3.7" and python_version < "4" inflection==0.5.1; python_version >= "3.6" itypes==1.2.0; python_version >= "3.6" jinja2==3.1.2; python_version >= "3.7" -jsonschema==4.6.0; python_version >= "3.7" +jsonschema==4.6.1; python_version >= "3.7" markdown==3.3.7; python_version >= "3.6" markupsafe==2.1.1; python_version >= "3.7" packaging==21.3; python_version >= "3.6" -phonenumbers==8.12.50; python_version >= "3.7" -pillow==9.1.1; python_version >= "3.7" +phonenumbers==8.12.51; python_version >= "3.7" +pillow==9.2.0; python_version >= "3.7" psycopg2-binary==2.9.3; python_version >= "3.6" pyjwt==2.4.0; python_version >= "3.7" pyparsing==3.0.9; python_full_version >= "3.6.8" and python_version >= "3.6" pyrsistent==0.18.1; python_version >= "3.7" pytz==2022.1; python_version >= "3.7" pyyaml==6.0; python_version >= "3.6" -requests==2.28.0; python_version >= "3.7" and python_version < "4" +requests==2.28.1; python_version >= "3.7" and python_version < "4" ruamel.yaml.clib==0.2.6; platform_python_implementation == "CPython" and python_version < "3.11" and python_version >= "3.6" ruamel.yaml==0.17.21; python_version >= "3.6" six==1.16.0; python_version >= "3.6" and python_full_version < "3.0.0" or python_version >= "3.6" and python_full_version >= "3.3.0" diff --git a/tadreebi/settings.py b/tadreebi/settings.py index 2b5840b..9188413 100644 --- a/tadreebi/settings.py +++ b/tadreebi/settings.py @@ -11,7 +11,6 @@ """ from pathlib import Path -import os import environ from django.conf import settings @@ -21,7 +20,7 @@ env = environ.Env( ALLOWED_HOSTS=(list, []), - DEBUG=(bool, False), + DEBUG=(bool, True), ENVIRONMENT=(str, "PRODUCTION"), SECRET_KEY=(str, ""), ALLOW_ALL_ORIGINS=(bool, False), @@ -54,12 +53,10 @@ SECRET_KEY = env.str("SECRET_KEY") # SECURITY WARNING: don't run with debug turned on in production! -ALLOWED_HOSTS = tuple(env.list("ALLOWED_HOSTS")) +ALLOWED_HOSTS = ['*'] DEBUG = env.bool("DEBUG") - - # Application definition INSTALLED_APPS = [ @@ -244,8 +241,14 @@ # } +CORS_ORIGIN_WHITELIST = tuple( + [ + "http://localhost:3000", + "http://localhost:8000", + "http://localhost:8080", + ] +) + CORS_ALLOW_ALL_ORIGINS = env.bool("CORS_ALLOW_ALL_ORIGINS") -CORS_ALLOW_METHODS = env.list("ALLOW_METHODS") -CORS_ALLOW_HEADERS = env.list("ALLOW_HEADERS") CSRF_TRUSTED_ORIGINS = tuple(env.list("CSRF_TRUSTED_ORIGINS")) From be8b8d6d13194fe5df9cb22ad24b0b4f148a7355 Mon Sep 17 00:00:00 2001 From: emad-almajdalawi Date: Tue, 5 Jul 2022 22:00:21 +0300 Subject: [PATCH 03/13] also working --- tadreebi/settings.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/tadreebi/settings.py b/tadreebi/settings.py index 9188413..7ea3ebd 100644 --- a/tadreebi/settings.py +++ b/tadreebi/settings.py @@ -241,13 +241,7 @@ # } -CORS_ORIGIN_WHITELIST = tuple( - [ - "http://localhost:3000", - "http://localhost:8000", - "http://localhost:8080", - ] -) +CORS_ORIGIN_WHITELIST = env.list("CORS_ORIGIN_WHITELIST") CORS_ALLOW_ALL_ORIGINS = env.bool("CORS_ALLOW_ALL_ORIGINS") From cc57d8f68ed8f6b99b569e3dc3c78373525ef6ad Mon Sep 17 00:00:00 2001 From: emad-almajdalawi Date: Wed, 6 Jul 2022 11:30:15 +0300 Subject: [PATCH 04/13] gunicorn --- docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 9387b34..7bb3ebd 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,8 +3,8 @@ version: "3.10" services: web: build: . - command: python manage.py runserver 0.0.0.0:8000 - # command: gunicorn tadreebi.wsgi:application --bind 0.0.0.0:8000 --workers 4 + # command: python manage.py runserver 0.0.0.0:8000 + command: gunicorn tadreebi.wsgi:application --bind 0.0.0.0:8000 --workers 4 volumes: - .:/code ports: From 6c0a26235bd2d78ce0444d4bc2db9f39d4b0d56d Mon Sep 17 00:00:00 2001 From: emad-almajdalawi Date: Wed, 6 Jul 2022 11:36:44 +0300 Subject: [PATCH 05/13] remote db --- tadreebi/settings.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tadreebi/settings.py b/tadreebi/settings.py index 7ea3ebd..b427b0e 100644 --- a/tadreebi/settings.py +++ b/tadreebi/settings.py @@ -120,14 +120,14 @@ "ENGINE": "django.db.backends.sqlite3", "NAME": BASE_DIR / "db.sqlite3", }, - # "postgresql": { - # "DATABASE_ENGINE": env.str("DATABASE_ENGINE"), - # "DATABASE_NAME": env.str("DATABASE_NAME"), - # "DATABASE_USER": env.str("DATABASE_USER"), - # "DATABASE_PASSWORD": env.str("DATABASE_PASSWORD"), - # "DATABASE_HOST": env.str("DATABASE_HOST"), - # "DATABASE_PORT": env.str("DATABASE_PORT"), - # }, + "postgresql": { + "DATABASE_ENGINE": env.str("DATABASE_ENGINE"), + "DATABASE_NAME": env.str("DATABASE_NAME"), + "DATABASE_USER": env.str("DATABASE_USER"), + "DATABASE_PASSWORD": env.str("DATABASE_PASSWORD"), + "DATABASE_HOST": env.str("DATABASE_HOST"), + "DATABASE_PORT": env.str("DATABASE_PORT"), + }, } From c22ee53274cf2f7b6f04cb6486eac3c0c0241bde Mon Sep 17 00:00:00 2001 From: emad-almajdalawi Date: Wed, 6 Jul 2022 11:44:55 +0300 Subject: [PATCH 06/13] default DB --- tadreebi/settings.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tadreebi/settings.py b/tadreebi/settings.py index b427b0e..f4043f6 100644 --- a/tadreebi/settings.py +++ b/tadreebi/settings.py @@ -116,11 +116,11 @@ # https://docs.djangoproject.com/en/4.0/ref/settings/#databases DATABASES = { + # "default": { + # "ENGINE": "django.db.backends.sqlite3", + # "NAME": BASE_DIR / "db.sqlite3", + # }, "default": { - "ENGINE": "django.db.backends.sqlite3", - "NAME": BASE_DIR / "db.sqlite3", - }, - "postgresql": { "DATABASE_ENGINE": env.str("DATABASE_ENGINE"), "DATABASE_NAME": env.str("DATABASE_NAME"), "DATABASE_USER": env.str("DATABASE_USER"), From c07cd18d4eb0092656e9684854fa0f7054dbba31 Mon Sep 17 00:00:00 2001 From: emad-almajdalawi Date: Wed, 6 Jul 2022 17:01:17 +0300 Subject: [PATCH 07/13] fix DB --- tadreebi/settings.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tadreebi/settings.py b/tadreebi/settings.py index f4043f6..65bc4a5 100644 --- a/tadreebi/settings.py +++ b/tadreebi/settings.py @@ -121,12 +121,12 @@ # "NAME": BASE_DIR / "db.sqlite3", # }, "default": { - "DATABASE_ENGINE": env.str("DATABASE_ENGINE"), - "DATABASE_NAME": env.str("DATABASE_NAME"), - "DATABASE_USER": env.str("DATABASE_USER"), - "DATABASE_PASSWORD": env.str("DATABASE_PASSWORD"), - "DATABASE_HOST": env.str("DATABASE_HOST"), - "DATABASE_PORT": env.str("DATABASE_PORT"), + "ENGINE": env.str("DATABASE_ENGINE"), + "NAME": env.str("DATABASE_NAME"), + "USER": env.str("DATABASE_USER"), + "PASSWORD": env.str("DATABASE_PASSWORD"), + "HOST": env.str("DATABASE_HOST"), + "PORT": env.str("DATABASE_PORT"), }, } @@ -241,7 +241,7 @@ # } -CORS_ORIGIN_WHITELIST = env.list("CORS_ORIGIN_WHITELIST") +# CORS_ORIGIN_WHITELIST = env.list("CORS_ORIGIN_WHITELIST") CORS_ALLOW_ALL_ORIGINS = env.bool("CORS_ALLOW_ALL_ORIGINS") From f6c1f6adf3033ba666f77a241677c38f523d08ac Mon Sep 17 00:00:00 2001 From: emad-almajdalawi Date: Wed, 6 Jul 2022 22:58:49 +0300 Subject: [PATCH 08/13] fix: delete report from UniverityFeedback --- app/models/UniversityFeedback.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/models/UniversityFeedback.py b/app/models/UniversityFeedback.py index faad355..37d5f9c 100644 --- a/app/models/UniversityFeedback.py +++ b/app/models/UniversityFeedback.py @@ -15,14 +15,14 @@ class UniversityFeedback(models.Model): related_name="student_idUniversityFeedback", on_delete=models.CASCADE, ) - report = models.OneToOneField( - StudentReport, - related_name="report_idStudentReport", - on_delete=models.CASCADE, - ) + # report = models.OneToOneField( + # StudentReport, + # related_name="report_idStudentReport", + # on_delete=models.CASCADE, + # ) title = models.CharField(max_length=256) feedback = models.TextField() - rating = models.IntegerField(choices=RATING_MARKS) + # rating = models.IntegerField(choices=RATING_MARKS) # Timestamps created_at = models.DateTimeField(auto_now_add=True, null=True) updated_at = models.DateTimeField(auto_now=True) From 2ce9bb9d72ed8dde0ebb05d460bfd7fce041a282 Mon Sep 17 00:00:00 2001 From: emad-almajdalawi Date: Thu, 7 Jul 2022 01:11:11 +0300 Subject: [PATCH 09/13] fix: users list, AllowAny --- app/api/views/CompanyRating.py | 8 ++-- app/api/views/CompanyReport.py | 8 ++-- app/api/views/Faculty.py | 4 +- app/api/views/InternshipPost.py | 4 +- app/api/views/StudentAppResponse.py | 8 ++-- app/api/views/StudentApplication.py | 18 ++++----- app/api/views/StudentExperience.py | 8 ++-- app/api/views/StudentGoal.py | 16 ++++---- app/api/views/StudentProfile.py | 56 ++++++++++++++-------------- app/api/views/StudentProposal.py | 8 ++-- app/api/views/StudentReport.py | 32 ++++++++-------- app/api/views/SupervisedBy.py | 4 +- app/api/views/UniproposalResponse.py | 8 ++-- app/api/views/UniversityFeedback.py | 8 ++-- app/api/views/UniversityTip.py | 16 ++++---- app/api/views/User.py | 24 +++++++++--- app/api/views/__init__.py | 3 ++ app/urls/User.py | 6 +++ 18 files changed, 130 insertions(+), 109 deletions(-) diff --git a/app/api/views/CompanyRating.py b/app/api/views/CompanyRating.py index 17fe0fd..cb9bd35 100644 --- a/app/api/views/CompanyRating.py +++ b/app/api/views/CompanyRating.py @@ -27,7 +27,7 @@ def perform_create(self, serializer): class CompanyRatingCreate(ListCreateAPIView): queryset = CompanyRating.objects.all() serializer_class = CompanyRatingSerializer - permission_classes = [IsOwnerOrReadOnly, StudentPermission] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) @@ -36,7 +36,7 @@ def perform_create(self, serializer): class CompanyRatingDetail(RetrieveAPIView): queryset = CompanyRating.objects.all() serializer_class = CompanyRatingSerializer - permission_classes = [IsOwnerOrReadOnly, StudentPermission] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) @@ -45,7 +45,7 @@ def perform_create(self, serializer): class CompanyRatingUpdate(RetrieveUpdateAPIView): queryset = CompanyRating.objects.all() serializer_class = CompanyRatingSerializer - permission_classes = [IsOwnerOrReadOnly, StudentPermission] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) @@ -54,7 +54,7 @@ def perform_create(self, serializer): class CompanyRatingDelete(RetrieveDestroyAPIView): queryset = CompanyRating.objects.all() serializer_class = CompanyRatingSerializer - permission_classes = [IsOwnerOrReadOnly] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) diff --git a/app/api/views/CompanyReport.py b/app/api/views/CompanyReport.py index 3482101..de78625 100644 --- a/app/api/views/CompanyReport.py +++ b/app/api/views/CompanyReport.py @@ -24,7 +24,7 @@ class CompanyReportList(ListAPIView): class CompanyReportCreate(ListCreateAPIView): queryset = CompanyReport.objects.all() serializer_class = CompanyReportSerializer - permission_classes = [IsOwnerOrReadOnly, CompanyPermission] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) @@ -33,7 +33,7 @@ def perform_create(self, serializer): class CompanyReportDetail(RetrieveAPIView): queryset = CompanyReport.objects.all() serializer_class = CompanyReportSerializer - permission_classes = [IsOwnerOrReadOnly, CompanyPermission] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) @@ -42,7 +42,7 @@ def perform_create(self, serializer): class CompanyReportUpdate(RetrieveUpdateAPIView): queryset = CompanyReport.objects.all() serializer_class = CompanyReportSerializer - permission_classes = [IsOwnerOrReadOnly, CompanyPermission] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) @@ -51,7 +51,7 @@ def perform_create(self, serializer): class CompanyReportDelete(RetrieveDestroyAPIView): queryset = CompanyReport.objects.all() serializer_class = CompanyReportSerializer - permission_classes = [IsOwnerOrReadOnly, CompanyPermission] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) diff --git a/app/api/views/Faculty.py b/app/api/views/Faculty.py index 3497791..daa9498 100644 --- a/app/api/views/Faculty.py +++ b/app/api/views/Faculty.py @@ -17,7 +17,7 @@ def has_permission(self, request, view): class FacultyListView(generics.ListCreateAPIView): queryset = Faculty.objects.all() serializer_class = FacultySerializer - permission_classes = [PermissionFacultyListView] + permission_classes = [permissions.AllowAny] class PermissionFacultyDetailsView(permissions.BasePermission): @@ -32,4 +32,4 @@ def has_permission(self, request, view): class FacultyDetailsView(generics.RetrieveUpdateDestroyAPIView): queryset = Faculty.objects.all() serializer_class = FacultySerializer - permission_classes = [PermissionFacultyDetailsView] + permission_classes = [permissions.AllowAny] diff --git a/app/api/views/InternshipPost.py b/app/api/views/InternshipPost.py index 4ba0c76..ca4765d 100644 --- a/app/api/views/InternshipPost.py +++ b/app/api/views/InternshipPost.py @@ -56,7 +56,7 @@ def perform_create(self, serializer): class InternshipPostDetail(RetrieveAPIView): queryset = InternshipPost.objects.all() serializer_class = InternshipPostSerializer - permission_classes = [IsOwnerOrReadOnly, CompanyPermission] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) @@ -84,7 +84,7 @@ def perform_create(self, serializer): class InternshipPostsViewSets(viewsets.ModelViewSet): queryset = InternshipPost.objects.all() serializer_class = InternshipPostSerializer - permission_classes = [IsOwnerOrReadOnly, CompanyPermission] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) diff --git a/app/api/views/StudentAppResponse.py b/app/api/views/StudentAppResponse.py index dc5c46f..371980a 100644 --- a/app/api/views/StudentAppResponse.py +++ b/app/api/views/StudentAppResponse.py @@ -25,7 +25,7 @@ class ApplicationResponseList(ListAPIView): class ApplicationResponseCreate(ListCreateAPIView): queryset = StudentApplicationResponse.objects.all() serializer_class = StudentApplicationResponseSerializer - permission_classes = [IsOwnerOrReadOnly, CompanyPermission] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) @@ -34,7 +34,7 @@ def perform_create(self, serializer): class ApplicationResponseDetail(RetrieveAPIView): queryset = StudentApplicationResponse.objects.all() serializer_class = StudentApplicationResponseSerializer - permission_classes = [IsOwnerOrReadOnly, CompanyPermission] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) @@ -43,7 +43,7 @@ def perform_create(self, serializer): class ApplicationResponseUpdate(RetrieveUpdateAPIView): queryset = StudentApplicationResponse.objects.all() serializer_class = StudentApplicationResponseSerializer - permission_classes = [IsOwnerOrReadOnly, CompanyPermission] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) @@ -52,7 +52,7 @@ def perform_create(self, serializer): class ApplicationResponseDelete(RetrieveDestroyAPIView): queryset = StudentApplicationResponse.objects.all() serializer_class = StudentApplicationResponseSerializer - permission_classes = [IsOwnerOrReadOnly, CompanyPermission] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) diff --git a/app/api/views/StudentApplication.py b/app/api/views/StudentApplication.py index b95524b..febd13f 100644 --- a/app/api/views/StudentApplication.py +++ b/app/api/views/StudentApplication.py @@ -27,7 +27,7 @@ class StudentApplicationList(ListAPIView): class StudentApplicationCreate(ListCreateAPIView): queryset = StudentApplication.objects.all() serializer_class = StudentApplicationSerializer - permission_classes = [IsOwnerOrReadOnly, StudentPermission] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) @@ -36,7 +36,7 @@ def perform_create(self, serializer): class StudentApplicationDetail(RetrieveAPIView): queryset = StudentApplication.objects.all() serializer_class = StudentApplicationSerializer - permission_classes = [IsOwnerOrReadOnly, StudentPermission] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) @@ -45,7 +45,7 @@ def perform_create(self, serializer): class StudentApplicationUpdate(RetrieveUpdateAPIView): queryset = StudentApplication.objects.all() serializer_class = StudentApplicationSerializer - permission_classes = [IsOwnerOrReadOnly, StudentPermission] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) @@ -54,7 +54,7 @@ def perform_create(self, serializer): class StudentApplicationDelete(RetrieveDestroyAPIView): queryset = StudentApplication.objects.all() serializer_class = StudentApplicationSerializer - permission_classes = [IsOwnerOrReadOnly, StudentPermission] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) @@ -64,7 +64,7 @@ def perform_create(self, serializer): class ApplicationsViewSets(viewsets.ModelViewSet): queryset = StudentApplication.objects.all() serializer_class = StudentApplicationSerializer - permission_classes = [IsOwnerOrReadOnly, StudentPermission] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) @@ -82,7 +82,7 @@ class StudentApplicationResponseList(ListAPIView): class StudentApplicationResponseCreate(ListCreateAPIView): queryset = StudentApplicationResponse.objects.all() serializer_class = StudentApplicationResponseSerializer - permission_classes = [IsOwnerOrReadOnly, StudentPermission] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) @@ -91,7 +91,7 @@ def perform_create(self, serializer): class StudentApplicationResponseDetail(RetrieveAPIView): queryset = StudentApplicationResponse.objects.all() serializer_class = StudentApplicationResponseSerializer - permission_classes = [IsOwnerOrReadOnly, StudentPermission] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) @@ -100,7 +100,7 @@ def perform_create(self, serializer): class StudentApplicationResponseUpdate(RetrieveUpdateAPIView): queryset = StudentApplicationResponse.objects.all() serializer_class = StudentApplicationResponseSerializer - permission_classes = [IsOwnerOrReadOnly, StudentPermission] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) @@ -109,7 +109,7 @@ def perform_create(self, serializer): class StudentApplicationResponseDelete(RetrieveDestroyAPIView): queryset = StudentApplicationResponse.objects.all() serializer_class = StudentApplicationResponseSerializer - permission_classes = [IsOwnerOrReadOnly, StudentPermission] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) diff --git a/app/api/views/StudentExperience.py b/app/api/views/StudentExperience.py index 209b1bc..f6fee8f 100644 --- a/app/api/views/StudentExperience.py +++ b/app/api/views/StudentExperience.py @@ -25,7 +25,7 @@ class StudentExperienceList(ListAPIView): class StudentExperienceCreate(ListCreateAPIView): queryset = StudentExperience.objects.all() serializer_class = StudentExperienceSerializer - permission_classes = [IsOwnerOrReadOnly, StudentPermission] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) @@ -34,7 +34,7 @@ def perform_create(self, serializer): class StudentExperienceDetail(RetrieveAPIView): queryset = StudentExperience.objects.all() serializer_class = StudentExperienceSerializer - permission_classes = [IsOwnerOrReadOnly, StudentPermission] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) @@ -43,7 +43,7 @@ def perform_create(self, serializer): class StudentExperienceUpdate(RetrieveUpdateAPIView): queryset = StudentExperience.objects.all() serializer_class = StudentExperienceSerializer - permission_classes = [IsOwnerOrReadOnly, StudentPermission] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) @@ -52,7 +52,7 @@ def perform_create(self, serializer): class StudentExperienceDelete(RetrieveDestroyAPIView): queryset = StudentExperience.objects.all() serializer_class = StudentExperienceSerializer - permission_classes = [IsOwnerOrReadOnly, StudentPermission] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) diff --git a/app/api/views/StudentGoal.py b/app/api/views/StudentGoal.py index 6516350..5875bb4 100644 --- a/app/api/views/StudentGoal.py +++ b/app/api/views/StudentGoal.py @@ -26,7 +26,7 @@ class StudentGoalsList(ListAPIView): class StudentGoalsCreate(ListCreateAPIView): queryset = StudentGoal.objects.all() serializer_class = StudentGoalsSerializer - permission_classes = [IsOwner, StudentStrictPermission] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) @@ -35,7 +35,7 @@ def perform_create(self, serializer): class StudentGoalsDetail(RetrieveAPIView): queryset = StudentGoal.objects.all() serializer_class = StudentGoalsSerializer - permission_classes = [IsOwner, StudentStrictPermission] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) @@ -44,7 +44,7 @@ def perform_create(self, serializer): class StudentGoalsUpdate(RetrieveUpdateAPIView): queryset = StudentGoal.objects.all() serializer_class = StudentGoalsSerializer - permission_classes = [IsOwner, StudentStrictPermission] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) @@ -53,7 +53,7 @@ def perform_create(self, serializer): class StudentGoalsDelete(RetrieveDestroyAPIView): queryset = StudentGoal.objects.all() serializer_class = StudentGoalsSerializer - permission_classes = [IsOwner, StudentStrictPermission] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) @@ -69,7 +69,7 @@ class StudentGoalIndicatorsList(ListAPIView): class StudentGoalIndicatorsCreate(ListCreateAPIView): queryset = StudentGoalIndicator.objects.all() serializer_class = StudentGoalIndicatorsSerializer - permission_classes = [IsOwner, StudentStrictPermission] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) @@ -78,7 +78,7 @@ def perform_create(self, serializer): class StudentGoalIndicatorsDetail(RetrieveAPIView): queryset = StudentGoalIndicator.objects.all() serializer_class = StudentGoalIndicatorsSerializer - permission_classes = [IsOwner, StudentStrictPermission] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) @@ -87,7 +87,7 @@ def perform_create(self, serializer): class StudentGoalIndicatorsUpdate(RetrieveUpdateAPIView): queryset = StudentGoalIndicator.objects.all() serializer_class = StudentGoalIndicatorsSerializer - permission_classes = [IsOwner, StudentStrictPermission] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) @@ -96,7 +96,7 @@ def perform_create(self, serializer): class StudentGoalIndicatorsDelete(RetrieveDestroyAPIView): queryset = StudentGoalIndicator.objects.all() serializer_class = StudentGoalIndicatorsSerializer - permission_classes = [IsOwner, StudentStrictPermission] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) diff --git a/app/api/views/StudentProfile.py b/app/api/views/StudentProfile.py index dd19f97..68749c7 100644 --- a/app/api/views/StudentProfile.py +++ b/app/api/views/StudentProfile.py @@ -39,7 +39,7 @@ class StudentProfileList(ListAPIView): class StudentProfileCreate(ListCreateAPIView): queryset = StudentProfile.objects.all() serializer_class = StudentProfileSerializer - permission_classes = [IsOwnerOrReadOnly, StudentPermission] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) @@ -48,7 +48,7 @@ def perform_create(self, serializer): class StudentProfileDetail(RetrieveAPIView): queryset = StudentProfile.objects.all() serializer_class = StudentProfileSerializer - permission_classes = [IsOwnerOrReadOnly, StudentPermission] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) @@ -57,7 +57,7 @@ def perform_create(self, serializer): class StudentProfileUpdate(RetrieveUpdateAPIView): queryset = StudentProfile.objects.all() serializer_class = StudentProfileSerializer - permission_classes = [IsOwnerOrReadOnly, StudentPermission] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) @@ -66,7 +66,7 @@ def perform_create(self, serializer): class StudentProfileDelete(RetrieveDestroyAPIView): queryset = StudentProfile.objects.all() serializer_class = StudentProfileSerializer - permission_classes = [IsOwnerOrReadOnly, StudentPermission] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) @@ -82,7 +82,7 @@ class StudentProfileExperienceList(ListAPIView): class StudentProfileExperienceCreate(ListCreateAPIView): queryset = StudentProfileExperience.objects.all() serializer_class = StudentProfileExperiencesSerializer - permission_classes = [IsOwnerOrReadOnly, StudentPermission] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) @@ -91,7 +91,7 @@ def perform_create(self, serializer): class StudentProfileExperienceDetail(RetrieveAPIView): queryset = StudentProfileExperience.objects.all() serializer_class = StudentProfileExperiencesSerializer - permission_classes = [IsOwnerOrReadOnly, StudentPermission] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) @@ -100,7 +100,7 @@ def perform_create(self, serializer): class StudentProfileExperienceUpdate(RetrieveUpdateAPIView): queryset = StudentProfileExperience.objects.all() serializer_class = StudentProfileExperiencesSerializer - permission_classes = [IsOwnerOrReadOnly, StudentPermission] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) @@ -109,7 +109,7 @@ def perform_create(self, serializer): class StudentProfileExperienceDelete(RetrieveDestroyAPIView): queryset = StudentProfileExperience.objects.all() serializer_class = StudentProfileExperiencesSerializer - permission_classes = [IsOwnerOrReadOnly, StudentPermission] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) @@ -125,7 +125,7 @@ class StudentProfileSkillList(ListAPIView): class StudentProfileSkillCreate(ListCreateAPIView): queryset = StudentProfileSkill.objects.all() serializer_class = StudentProfileSkillsSerializer - permission_classes = [IsOwnerOrReadOnly, StudentPermission] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) @@ -134,7 +134,7 @@ def perform_create(self, serializer): class StudentProfileSkillDetail(RetrieveAPIView): queryset = StudentProfileSkill.objects.all() serializer_class = StudentProfileSkillsSerializer - permission_classes = [IsOwnerOrReadOnly, StudentPermission] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) @@ -143,7 +143,7 @@ def perform_create(self, serializer): class StudentProfileSkillUpdate(RetrieveUpdateAPIView): queryset = StudentProfileSkill.objects.all() serializer_class = StudentProfileSkillsSerializer - permission_classes = [IsOwnerOrReadOnly, StudentPermission] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) @@ -152,7 +152,7 @@ def perform_create(self, serializer): class StudentProfileSkillDelete(RetrieveDestroyAPIView): queryset = StudentProfileSkill.objects.all() serializer_class = StudentProfileSkillsSerializer - permission_classes = [IsOwnerOrReadOnly, StudentPermission] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) @@ -168,7 +168,7 @@ class StudentProfileEducationList(ListAPIView): class StudentProfileEducationCreate(ListCreateAPIView): queryset = StudentProfileEducation.objects.all() serializer_class = StudentProfileEducationsSerializer - permission_classes = [IsOwnerOrReadOnly, StudentPermission] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) @@ -177,7 +177,7 @@ def perform_create(self, serializer): class StudentProfileEducationDetail(RetrieveAPIView): queryset = StudentProfileEducation.objects.all() serializer_class = StudentProfileEducationsSerializer - permission_classes = [IsOwnerOrReadOnly, StudentPermission] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) @@ -186,7 +186,7 @@ def perform_create(self, serializer): class StudentProfileEducationUpdate(RetrieveUpdateAPIView): queryset = StudentProfileEducation.objects.all() serializer_class = StudentProfileEducationsSerializer - permission_classes = [IsOwnerOrReadOnly, StudentPermission] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) @@ -195,7 +195,7 @@ def perform_create(self, serializer): class StudentProfileEducationDelete(RetrieveDestroyAPIView): queryset = StudentProfileEducation.objects.all() serializer_class = StudentProfileEducationsSerializer - permission_classes = [IsOwnerOrReadOnly, StudentPermission] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) @@ -211,7 +211,7 @@ class StudentProfileLanguageList(ListAPIView): class StudentProfileLanguageCreate(ListCreateAPIView): queryset = StudentProfileLanguage.objects.all() serializer_class = StudentProfileLanguagesSerializer - permission_classes = [IsOwnerOrReadOnly, StudentPermission] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) @@ -220,7 +220,7 @@ def perform_create(self, serializer): class StudentProfileLanguageDetail(RetrieveAPIView): queryset = StudentProfileLanguage.objects.all() serializer_class = StudentProfileLanguagesSerializer - permission_classes = [IsOwnerOrReadOnly, StudentPermission] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) @@ -229,7 +229,7 @@ def perform_create(self, serializer): class StudentProfileLanguageUpdate(RetrieveUpdateAPIView): queryset = StudentProfileLanguage.objects.all() serializer_class = StudentProfileLanguagesSerializer - permission_classes = [IsOwnerOrReadOnly, StudentPermission] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) @@ -238,7 +238,7 @@ def perform_create(self, serializer): class StudentProfileLanguageDelete(RetrieveDestroyAPIView): queryset = StudentProfileLanguage.objects.all() serializer_class = StudentProfileLanguagesSerializer - permission_classes = [IsOwnerOrReadOnly, StudentPermission] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) @@ -254,7 +254,7 @@ class StudentProfileContactList(ListAPIView): class StudentProfileContactCreate(ListCreateAPIView): queryset = StudentProfileContact.objects.all() serializer_class = StudentProfileContactsSerializer - permission_classes = [IsOwnerOrReadOnly, StudentPermission] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) @@ -263,7 +263,7 @@ def perform_create(self, serializer): class StudentProfileContactDetail(RetrieveAPIView): queryset = StudentProfileContact.objects.all() serializer_class = StudentProfileContactsSerializer - permission_classes = [IsOwnerOrReadOnly, StudentPermission] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) @@ -272,7 +272,7 @@ def perform_create(self, serializer): class StudentProfileContactUpdate(RetrieveUpdateAPIView): queryset = StudentProfileContact.objects.all() serializer_class = StudentProfileContactsSerializer - permission_classes = [IsOwnerOrReadOnly, StudentPermission] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) @@ -281,7 +281,7 @@ def perform_create(self, serializer): class StudentProfileContactDelete(RetrieveDestroyAPIView): queryset = StudentProfileContact.objects.all() serializer_class = StudentProfileContactsSerializer - permission_classes = [IsOwnerOrReadOnly, StudentPermission] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) @@ -297,7 +297,7 @@ class StudentProfileWorkList(ListAPIView): class StudentProfileWorkCreate(ListCreateAPIView): queryset = StudentProfileWork.objects.all() serializer_class = StudentProfileWorksSerializer - permission_classes = [IsOwnerOrReadOnly, StudentPermission] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) @@ -306,7 +306,7 @@ def perform_create(self, serializer): class StudentProfileWorkDetail(RetrieveAPIView): queryset = StudentProfileWork.objects.all() serializer_class = StudentProfileWorksSerializer - permission_classes = [IsOwnerOrReadOnly, StudentPermission] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) @@ -315,7 +315,7 @@ def perform_create(self, serializer): class StudentProfileWorkUpdate(RetrieveUpdateAPIView): queryset = StudentProfileWork.objects.all() serializer_class = StudentProfileWorksSerializer - permission_classes = [IsOwnerOrReadOnly, StudentPermission] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) @@ -324,7 +324,7 @@ def perform_create(self, serializer): class StudentProfileWorkDelete(RetrieveDestroyAPIView): queryset = StudentProfileWork.objects.all() serializer_class = StudentProfileWorksSerializer - permission_classes = [IsOwnerOrReadOnly, StudentPermission] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) diff --git a/app/api/views/StudentProposal.py b/app/api/views/StudentProposal.py index af38b2b..975363c 100644 --- a/app/api/views/StudentProposal.py +++ b/app/api/views/StudentProposal.py @@ -36,7 +36,7 @@ class Proposal_List_View(ListAPIView): class proposal_create(ListCreateAPIView): queryset = StudentUniProposal.objects.all() serializer_class = StudentprposalSerializer - permission_classes = [IsOwnerOrReadOnly, StudentPermission] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) @@ -45,7 +45,7 @@ def perform_create(self, serializer): class proposal_detail_view(RetrieveAPIView): queryset = StudentUniProposal.objects.all() serializer_class = StudentprposalSerializer - permission_classes = [IsOwnerOrReadOnly, StudentPermission] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) @@ -54,7 +54,7 @@ def perform_create(self, serializer): class proposal_Update(RetrieveUpdateAPIView): queryset = StudentUniProposal.objects.all() serializer_class = StudentprposalSerializer - permission_classes = [IsOwnerOrReadOnly, StudentPermission] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) @@ -63,7 +63,7 @@ def perform_create(self, serializer): class proposal_delete(RetrieveDestroyAPIView): queryset = StudentUniProposal.objects.all() serializer_class = StudentprposalSerializer - permission_classes = [IsOwnerOrReadOnly, StudentPermission] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) diff --git a/app/api/views/StudentReport.py b/app/api/views/StudentReport.py index cd55bdd..c7f9832 100644 --- a/app/api/views/StudentReport.py +++ b/app/api/views/StudentReport.py @@ -33,7 +33,7 @@ class StudentReportsList(ListAPIView): class StudentReportsCreate(ListCreateAPIView): queryset = StudentReport.objects.all() serializer_class = StudentReportsSerializer - permission_classes = [IsOwnerOrReadOnly, StudentPermission] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) @@ -42,7 +42,7 @@ def perform_create(self, serializer): class StudentReportsDetail(RetrieveAPIView): queryset = StudentReport.objects.all() serializer_class = StudentReportsSerializer - permission_classes = [IsOwnerOrReadOnly, StudentPermission] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) @@ -51,7 +51,7 @@ def perform_create(self, serializer): class StudentReportsUpdate(RetrieveUpdateAPIView): queryset = StudentReport.objects.all() serializer_class = StudentReportsSerializer - permission_classes = [IsOwnerOrReadOnly, StudentPermission] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) @@ -60,7 +60,7 @@ def perform_create(self, serializer): class StudentReportsDelete(RetrieveDestroyAPIView): queryset = StudentReport.objects.all() serializer_class = StudentReportsSerializer - permission_classes = [IsOwnerOrReadOnly, StudentPermission] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) @@ -112,7 +112,7 @@ class StudentReportRemarksList(ListAPIView): class StudentReportRemarksCreate(ListCreateAPIView): queryset = StudentReportRemark.objects.all() serializer_class = StudentReportRemarksSerializer - permission_classes = [IsOwnerOrReadOnly, StudentPermission] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) @@ -121,7 +121,7 @@ def perform_create(self, serializer): class StudentReportRemarksDetail(RetrieveAPIView): queryset = StudentReportRemark.objects.all() serializer_class = StudentReportRemarksSerializer - permission_classes = [IsOwnerOrReadOnly, StudentPermission] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) @@ -130,7 +130,7 @@ def perform_create(self, serializer): class StudentReportRemarksUpdate(RetrieveUpdateAPIView): queryset = StudentReportRemark.objects.all() serializer_class = StudentReportRemarksSerializer - permission_classes = [IsOwnerOrReadOnly, StudentPermission] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) @@ -139,7 +139,7 @@ def perform_create(self, serializer): class StudentReportRemarksDelete(RetrieveDestroyAPIView): queryset = StudentReportRemark.objects.all() serializer_class = StudentReportRemarksSerializer - permission_classes = [IsOwnerOrReadOnly, StudentPermission] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) @@ -155,7 +155,7 @@ class StudentReportSkillsList(ListAPIView): class StudentReportSkillsCreate(ListCreateAPIView): queryset = StudentReportSkill.objects.all() serializer_class = StudentReportSkillsSerializer - permission_classes = [IsOwnerOrReadOnly, StudentPermission] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) @@ -164,7 +164,7 @@ def perform_create(self, serializer): class StudentReportSkillsDetail(RetrieveAPIView): queryset = StudentReportSkill.objects.all() serializer_class = StudentReportSkillsSerializer - permission_classes = [IsOwnerOrReadOnly, StudentPermission] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) @@ -173,7 +173,7 @@ def perform_create(self, serializer): class StudentReportSkillsUpdate(RetrieveUpdateAPIView): queryset = StudentReportSkill.objects.all() serializer_class = StudentReportSkillsSerializer - permission_classes = [IsOwnerOrReadOnly, StudentPermission] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) @@ -182,7 +182,7 @@ def perform_create(self, serializer): class StudentReportSkillsDelete(RetrieveDestroyAPIView): queryset = StudentReportSkill.objects.all() serializer_class = StudentReportSkillsSerializer - permission_classes = [IsOwnerOrReadOnly, StudentPermission] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) @@ -198,7 +198,7 @@ class StudentReportAchievementsList(ListAPIView): class StudentReportAchievementsCreate(ListCreateAPIView): queryset = StudentReportAchievement.objects.all() serializer_class = StudentReportAchievementsSerializer - permission_classes = [IsOwnerOrReadOnly, StudentPermission] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) @@ -207,7 +207,7 @@ def perform_create(self, serializer): class StudentReportAchievementsDetail(RetrieveAPIView): queryset = StudentReportAchievement.objects.all() serializer_class = StudentReportAchievementsSerializer - permission_classes = [IsOwnerOrReadOnly, StudentPermission] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) @@ -216,7 +216,7 @@ def perform_create(self, serializer): class StudentReportAchievementsUpdate(RetrieveUpdateAPIView): queryset = StudentReportAchievement.objects.all() serializer_class = StudentReportAchievementsSerializer - permission_classes = [IsOwnerOrReadOnly, StudentPermission] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) @@ -225,7 +225,7 @@ def perform_create(self, serializer): class StudentReportAchievementsDelete(RetrieveDestroyAPIView): queryset = StudentReportAchievement.objects.all() serializer_class = StudentReportAchievementsSerializer - permission_classes = [IsOwnerOrReadOnly, StudentPermission] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) diff --git a/app/api/views/SupervisedBy.py b/app/api/views/SupervisedBy.py index 0b2b121..854e5e3 100644 --- a/app/api/views/SupervisedBy.py +++ b/app/api/views/SupervisedBy.py @@ -17,7 +17,7 @@ def has_permission(self, request, view): class SupervisedByListView(generics.ListCreateAPIView): queryset = SupervisedBy.objects.all() serializer_class = SupervisedBySerializer - permission_classes = [PermissionSupervisedByListView] + permission_classes = [permissions.AllowAny] class PermissionSupervisedByDetailsView(permissions.BasePermission): @@ -32,4 +32,4 @@ def has_permission(self, request, view): class SupervisedByDetailsView(generics.RetrieveUpdateDestroyAPIView): queryset = SupervisedBy.objects.all() serializer_class = SupervisedBySerializer - permission_classes = [PermissionSupervisedByDetailsView] + permission_classes = [permissions.AllowAny] diff --git a/app/api/views/UniproposalResponse.py b/app/api/views/UniproposalResponse.py index 0f6178c..3395d0c 100644 --- a/app/api/views/UniproposalResponse.py +++ b/app/api/views/UniproposalResponse.py @@ -24,7 +24,7 @@ class UniResponse_List_View(ListAPIView): class UniResponse_create(ListCreateAPIView): queryset = UniProposalResponse.objects.all() serializer_class = UniProposalResponseSerializer - permission_classes = [IsOwnerOrReadOnly, UniversityPermission] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) @@ -33,7 +33,7 @@ def perform_create(self, serializer): class UniResponse_detail_view(RetrieveAPIView): queryset = UniProposalResponse.objects.all() serializer_class = UniProposalResponseSerializer - permission_classes = [IsOwnerOrReadOnly, UniversityPermission] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) @@ -42,7 +42,7 @@ def perform_create(self, serializer): class UniResponse_Update(RetrieveUpdateAPIView): queryset = UniProposalResponse.objects.all() serializer_class = UniProposalResponseSerializer - permission_classes = [IsOwnerOrReadOnly, UniversityPermission] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) @@ -51,7 +51,7 @@ def perform_create(self, serializer): class UniResponse_delete(RetrieveDestroyAPIView): queryset = UniProposalResponse.objects.all() serializer_class = UniProposalResponseSerializer - permission_classes = [IsOwnerOrReadOnly, UniversityPermission] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) diff --git a/app/api/views/UniversityFeedback.py b/app/api/views/UniversityFeedback.py index ba9ed56..f274c88 100644 --- a/app/api/views/UniversityFeedback.py +++ b/app/api/views/UniversityFeedback.py @@ -25,7 +25,7 @@ def perform_create(self, serializer): class UniversityFeedbackCreate(ListCreateAPIView): queryset = UniversityFeedback.objects.all() serializer_class = UniversityFeedbackSerializer - permission_classes = [UniversityPermission, IsOwnerOrReadOnly] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) @@ -34,7 +34,7 @@ def perform_create(self, serializer): class UniversityFeedbackDetail(RetrieveAPIView): queryset = UniversityFeedback.objects.all() serializer_class = UniversityFeedbackSerializer - permission_classes = [UniversityPermission, IsOwnerOrReadOnly] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) @@ -43,7 +43,7 @@ def perform_create(self, serializer): class UniversityFeedbackUpdate(RetrieveUpdateAPIView): queryset = UniversityFeedback.objects.all() serializer_class = UniversityFeedbackSerializer - permission_classes = [UniversityPermission, IsOwnerOrReadOnly] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) @@ -52,7 +52,7 @@ def perform_create(self, serializer): class UniversityFeedbackDelete(RetrieveDestroyAPIView): queryset = UniversityFeedback.objects.all() serializer_class = UniversityFeedbackSerializer - permission_classes = [UniversityPermission, IsOwnerOrReadOnly] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) diff --git a/app/api/views/UniversityTip.py b/app/api/views/UniversityTip.py index e2bcf2f..16141ca 100644 --- a/app/api/views/UniversityTip.py +++ b/app/api/views/UniversityTip.py @@ -20,7 +20,7 @@ class UniversityTipsList(ListAPIView): class UniversityTipsCreate(ListCreateAPIView): queryset = UniversityTip.objects.all() serializer_class = UniversityTipsSerializer - permission_classes = [IsOwnerOrReadOnly, UniversityPermission] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) @@ -29,7 +29,7 @@ def perform_create(self, serializer): class UniversityTipsDetail(RetrieveAPIView): queryset = UniversityTip.objects.all() serializer_class = UniversityTipsSerializer - permission_classes = [IsOwnerOrReadOnly, UniversityPermission] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) @@ -38,7 +38,7 @@ def perform_create(self, serializer): class UniversityTipsUpdate(RetrieveUpdateAPIView): queryset = UniversityTip.objects.all() serializer_class = UniversityTipsSerializer - permission_classes = [IsOwnerOrReadOnly, UniversityPermission] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) @@ -47,7 +47,7 @@ def perform_create(self, serializer): class UniversityTipsDelete(RetrieveDestroyAPIView): queryset = UniversityTip.objects.all() serializer_class = UniversityTipsSerializer - permission_classes = [IsOwnerOrReadOnly, UniversityPermission] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) @@ -63,7 +63,7 @@ class UniversityTipTopicsList(ListAPIView): class UniversityTipTopicsCreate(ListCreateAPIView): queryset = UniversityTipTopic.objects.all() serializer_class = UniversityTipTopicsSerializer - permission_classes = [IsOwnerOrReadOnly, UniversityPermission] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) @@ -72,7 +72,7 @@ def perform_create(self, serializer): class UniversityTipTopicsDetail(RetrieveAPIView): queryset = UniversityTipTopic.objects.all() serializer_class = UniversityTipTopicsSerializer - permission_classes = [IsOwnerOrReadOnly, UniversityPermission] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) @@ -81,7 +81,7 @@ def perform_create(self, serializer): class UniversityTipTopicsUpdate(RetrieveUpdateAPIView): queryset = UniversityTipTopic.objects.all() serializer_class = UniversityTipTopicsSerializer - permission_classes = [IsOwnerOrReadOnly, UniversityPermission] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) @@ -90,7 +90,7 @@ def perform_create(self, serializer): class UniversityTipTopicsDelete(RetrieveDestroyAPIView): queryset = UniversityTipTopic.objects.all() serializer_class = UniversityTipTopicsSerializer - permission_classes = [IsOwnerOrReadOnly, UniversityPermission] + permission_classes = [permissions.AllowAny] def perform_create(self, serializer): serializer.save(author=self.request.user) diff --git a/app/api/views/User.py b/app/api/views/User.py index 01e831a..9b147a0 100644 --- a/app/api/views/User.py +++ b/app/api/views/User.py @@ -18,17 +18,21 @@ def has_permission(self, request, view): return True return False +class StudentUserListView(generics.ListAPIView): + permission_classes = [permissions.AllowAny] + queryset = StudentUser.objects.all() + serializer_class = StudentSerializer class StudentSignUpView(generics.ListCreateAPIView): queryset = StudentUser.objects.all() serializer_class = StudentSerializer - permission_classes = [PermissionStudentSignUp] + permission_classes = [permissions.AllowAny] class StudentSignUpDetail(generics.RetrieveUpdateDestroyAPIView): queryset = StudentUser.objects.all() serializer_class = StudentSerializer - permission_classes = [PermissionStudentSignUp] + permission_classes = [permissions.AllowAny] lookup_field = "username" @@ -43,17 +47,21 @@ def has_permission(self, request, view): return True return False +class UniversityEmployeeUserListView(generics.ListAPIView): + queryset = UniversityEmployeeUser.objects.all() + serializer_class = UniversitySerializer + permission_classes = [permissions.AllowAny] class UniversitySignUpView(generics.ListCreateAPIView): queryset = UniversityEmployeeUser.objects.all() serializer_class = UniversitySerializer - permission_classes = [PermissionUniversitySignUp] + permission_classes = [permissions.AllowAny] class UniversitySignUpDetail(generics.RetrieveUpdateDestroyAPIView): queryset = UniversityEmployeeUser.objects.all() serializer_class = UniversitySerializer - permission_classes = [PermissionUniversitySignUp] + permission_classes = [permissions.AllowAny] lookup_field = "username" @@ -68,15 +76,19 @@ def has_permission(self, request, view): return True return False +class CompanyUserListView(generics.ListAPIView): + queryset = CompanyUser.objects.all() + serializer_class = CompanySerializer + permission_classes = [permissions.AllowAny] class CompanySignUpView(generics.ListCreateAPIView): queryset = CompanyUser.objects.all() serializer_class = CompanySerializer - permission_classes = [PermissionCompanySignUp] + permission_classes = [permissions.AllowAny] class CompanySignUpDetail(generics.RetrieveUpdateDestroyAPIView): queryset = CompanyUser.objects.all() serializer_class = CompanySerializer - permission_classes = [PermissionCompanySignUp] + permission_classes = [permissions.AllowAny] lookup_field = "username" diff --git a/app/api/views/__init__.py b/app/api/views/__init__.py index ff3f590..b1c2b83 100644 --- a/app/api/views/__init__.py +++ b/app/api/views/__init__.py @@ -164,6 +164,9 @@ StudentSignUpDetail, UniversitySignUpDetail, CompanySignUpDetail, + StudentUserListView, + UniversityEmployeeUserListView, + CompanyUserListView, ) diff --git a/app/urls/User.py b/app/urls/User.py index f354ba2..fd17c84 100644 --- a/app/urls/User.py +++ b/app/urls/User.py @@ -7,6 +7,9 @@ StudentSignUpDetail, UniversitySignUpDetail, CompanySignUpDetail, + StudentUserListView, + UniversityEmployeeUserListView, + CompanyUserListView, ) @@ -39,4 +42,7 @@ CompanySignUpDetail.as_view(), name="company_detail", ), + path("accounts/student-list", StudentUserListView.as_view(), name="student_list"), + path("accounts/university-list", UniversityEmployeeUserListView.as_view(), name="university_list"), + path("accounts/company-list", CompanyUserListView.as_view(), name="company_list"), ] From ba9975335dd28d08f9f2e679b96d7a2773c8d6d4 Mon Sep 17 00:00:00 2001 From: emad-almajdalawi Date: Thu, 7 Jul 2022 01:20:22 +0300 Subject: [PATCH 10/13] user list serializer (only username) --- app/api/serializers/User.py | 17 +++++++++++++++++ app/api/serializers/__init__.py | 3 +++ app/api/views/User.py | 9 ++++++--- 3 files changed, 26 insertions(+), 3 deletions(-) diff --git a/app/api/serializers/User.py b/app/api/serializers/User.py index 7cf4488..44598ae 100644 --- a/app/api/serializers/User.py +++ b/app/api/serializers/User.py @@ -8,6 +8,11 @@ class Meta: fields = "__all__" +class StudentUsersListSerializer(serializers.ModelSerializer): + class Meta: + model = StudentUser + fields = "username" + class UniversitySerializer(serializers.ModelSerializer): class Meta: @@ -16,8 +21,20 @@ class Meta: fields = "__all__" +class UniversityEmployee1UsersListSerializer(serializers.ModelSerializer): + class Meta: + model = UniversityEmployeeUser + fields = "username" + + class CompanySerializer(serializers.ModelSerializer): class Meta: model = CompanyUser fields = "__all__" + + +class CompanyUsersListSerializer(serializers.ModelSerializer): + class Meta: + model = CompanyUser + fields = "username" diff --git a/app/api/serializers/__init__.py b/app/api/serializers/__init__.py index 44f90e3..9842c46 100644 --- a/app/api/serializers/__init__.py +++ b/app/api/serializers/__init__.py @@ -41,6 +41,9 @@ StudentSerializer, UniversitySerializer, CompanySerializer, + StudentUsersListSerializer, + UniversityEmployee1UsersListSerializer, + CompanyUsersListSerializer, ) from .Cities import CitiesSerializer diff --git a/app/api/views/User.py b/app/api/views/User.py index 9b147a0..e934253 100644 --- a/app/api/views/User.py +++ b/app/api/views/User.py @@ -4,6 +4,9 @@ StudentSerializer, UniversitySerializer, CompanySerializer, + StudentUsersListSerializer, + UniversityEmployee1UsersListSerializer, + CompanyUsersListSerializer, ) @@ -21,7 +24,7 @@ def has_permission(self, request, view): class StudentUserListView(generics.ListAPIView): permission_classes = [permissions.AllowAny] queryset = StudentUser.objects.all() - serializer_class = StudentSerializer + serializer_class = StudentUsersListSerializer class StudentSignUpView(generics.ListCreateAPIView): queryset = StudentUser.objects.all() @@ -49,7 +52,7 @@ def has_permission(self, request, view): class UniversityEmployeeUserListView(generics.ListAPIView): queryset = UniversityEmployeeUser.objects.all() - serializer_class = UniversitySerializer + serializer_class = UniversityEmployee1UsersListSerializer permission_classes = [permissions.AllowAny] class UniversitySignUpView(generics.ListCreateAPIView): @@ -78,7 +81,7 @@ def has_permission(self, request, view): class CompanyUserListView(generics.ListAPIView): queryset = CompanyUser.objects.all() - serializer_class = CompanySerializer + serializer_class = CompanyUsersListSerializer permission_classes = [permissions.AllowAny] class CompanySignUpView(generics.ListCreateAPIView): From ee05d5ac731045639c10426a96c7ec8a15ca4ba5 Mon Sep 17 00:00:00 2001 From: emad-almajdalawi Date: Thu, 7 Jul 2022 01:26:16 +0300 Subject: [PATCH 11/13] fix serializer --- app/api/serializers/User.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/api/serializers/User.py b/app/api/serializers/User.py index 44598ae..f9e210b 100644 --- a/app/api/serializers/User.py +++ b/app/api/serializers/User.py @@ -11,7 +11,7 @@ class Meta: class StudentUsersListSerializer(serializers.ModelSerializer): class Meta: model = StudentUser - fields = "username" + fields = "[username,]" class UniversitySerializer(serializers.ModelSerializer): @@ -24,7 +24,7 @@ class Meta: class UniversityEmployee1UsersListSerializer(serializers.ModelSerializer): class Meta: model = UniversityEmployeeUser - fields = "username" + fields = "[username,]" class CompanySerializer(serializers.ModelSerializer): @@ -37,4 +37,4 @@ class Meta: class CompanyUsersListSerializer(serializers.ModelSerializer): class Meta: model = CompanyUser - fields = "username" + fields = "[username,]" From 0c959109597b0b5eaead0f5a64605cfbf695812e Mon Sep 17 00:00:00 2001 From: emad-almajdalawi Date: Thu, 7 Jul 2022 01:30:11 +0300 Subject: [PATCH 12/13] fix user serializers --- app/api/serializers/User.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/api/serializers/User.py b/app/api/serializers/User.py index f9e210b..d287fbe 100644 --- a/app/api/serializers/User.py +++ b/app/api/serializers/User.py @@ -11,7 +11,7 @@ class Meta: class StudentUsersListSerializer(serializers.ModelSerializer): class Meta: model = StudentUser - fields = "[username,]" + fields = ['username',] class UniversitySerializer(serializers.ModelSerializer): @@ -24,7 +24,7 @@ class Meta: class UniversityEmployee1UsersListSerializer(serializers.ModelSerializer): class Meta: model = UniversityEmployeeUser - fields = "[username,]" + fields = ['username',] class CompanySerializer(serializers.ModelSerializer): @@ -37,4 +37,4 @@ class Meta: class CompanyUsersListSerializer(serializers.ModelSerializer): class Meta: model = CompanyUser - fields = "[username,]" + fields = ['username',] From eac2d2ca38a2842435f17b933042596d0272bf73 Mon Sep 17 00:00:00 2001 From: emad-almajdalawi Date: Thu, 7 Jul 2022 02:06:39 +0300 Subject: [PATCH 13/13] all --- app/api/serializers/User.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/api/serializers/User.py b/app/api/serializers/User.py index d287fbe..ed6171f 100644 --- a/app/api/serializers/User.py +++ b/app/api/serializers/User.py @@ -11,7 +11,7 @@ class Meta: class StudentUsersListSerializer(serializers.ModelSerializer): class Meta: model = StudentUser - fields = ['username',] + fields = "__all__" class UniversitySerializer(serializers.ModelSerializer): @@ -24,7 +24,7 @@ class Meta: class UniversityEmployee1UsersListSerializer(serializers.ModelSerializer): class Meta: model = UniversityEmployeeUser - fields = ['username',] + fields = "__all__" class CompanySerializer(serializers.ModelSerializer): @@ -37,4 +37,4 @@ class Meta: class CompanyUsersListSerializer(serializers.ModelSerializer): class Meta: model = CompanyUser - fields = ['username',] + fields = "__all__"