Merge pull request #77 from OpenLXP/notification_sort

email sort

app/configurations/models.py

@@ -7,9 +7,8 @@
 from django.dispatch import receiver
 from django.forms import ValidationError
 from django.urls import reverse
-from model_utils.models import TimeStampedModel
-
 from es_api.utils.queries_base import BaseQueries
+from model_utils.models import TimeStampedModel
 from users.models import Organization, XDSUser
 
 logger = logging.getLogger('dict_config_logger')

app/configurations/serializers.py

@@ -1,5 +1,4 @@
 from rest_framework import serializers
-
 from xds_api.serializers import (CourseDetailHighlightSerializer,
                                  CourseInformationMappingSerializer,
                                  SearchSortOptionSerializer)

app/configurations/tests/test_setup.py

@@ -1,10 +1,9 @@
 from unittest.mock import patch
 
-from openlxp_notifications.models import email
-from rest_framework.test import APITestCase
-
 from configurations.models import XDSConfiguration
 from core.models import Experience, InterestList, SavedFilter
+from openlxp_notifications.models import email
+from rest_framework.test import APITestCase
 from users.models import XDSUser
 
 

app/configurations/tests/test_views_integration.py

@@ -1,16 +1,15 @@
 import json
 
+from configurations.models import (CourseInformationMapping, XDSConfiguration,
+                                   XDSUIConfiguration)
+from core.models import SearchSortOption
 from django.core.exceptions import ValidationError
 from django.db.utils import IntegrityError
 from django.test import TestCase, tag
 from django.urls import reverse
 from rest_framework import status
 from rest_framework.test import APITestCase
 
-from configurations.models import (CourseInformationMapping, XDSConfiguration,
-                                   XDSUIConfiguration)
-from core.models import SearchSortOption
-
 
 @tag('integration')
 class ViewTests(APITestCase):

app/configurations/tests/test_views_unit.py

@@ -1,14 +1,12 @@
 import json
 from unittest.mock import patch
 
+from configurations.models import (CourseInformationMapping, XDSConfiguration,
+                                   XDSUIConfiguration)
 from django.contrib.auth.models import Group
 from django.test import tag
 from django.urls import reverse
 from rest_framework import status
-
-from configurations.models import (CourseInformationMapping, XDSConfiguration,
-                                   XDSUIConfiguration)
-
 from users.models import Organization, XDSUser
 
 from .test_setup import TestSetUp

app/core/admin.py

@@ -1,8 +1,7 @@
-from django.contrib import admin
-
 from core.models import (CourseDetailHighlight, CourseSpotlight, Experience,
                          InterestList, SavedFilter, SearchFilter,
                          SearchSortOption)
+from django.contrib import admin
 
 
 @admin.register(SearchFilter)

app/core/models.py

@@ -1,12 +1,11 @@
+from configurations.models import XDSUIConfiguration
 from django.conf import settings
 from django.core.validators import MinValueValidator
 from django.db import models
 from django.forms import ValidationError
 from django.urls import reverse
 from model_utils.models import TimeStampedModel
 
-from configurations.models import XDSUIConfiguration
-
 
 class SearchFilter(TimeStampedModel):
     """Model to contain fields used for filtering search results"""

app/core/signals.py

@@ -1,9 +1,10 @@
 import logging
+
 from django.conf import settings
 from django.db.models.signals import m2m_changed
 from django.dispatch import receiver
 from notifications.signals import notify
-from openlxp_notifications.management.commands. \
+from openlxp_notifications.management.commands.\
     trigger_subscribed_list_update import \
     trigger_update
 from openlxp_notifications.models import email

app/core/tests/test_commands_unit.py

@@ -1,8 +1,7 @@
+from core.models import Experience, InterestList
 from django.conf import settings
 from django.core.management import call_command
 from django.test import tag
-
-from core.models import Experience, InterestList
 from users.models import XDSUser
 
 from .test_setup import TestSetUp

app/core/tests/test_models_integration.py

@@ -1,8 +1,7 @@
-from django.core.exceptions import ValidationError
-from django.test import TestCase, tag
-
 from configurations.models import XDSConfiguration, XDSUIConfiguration
 from core.models import CourseDetailHighlight
+from django.core.exceptions import ValidationError
+from django.test import TestCase, tag
 
 
 @tag('integration')

app/core/tests/test_models_unit.py

@@ -1,9 +1,8 @@
-from django.test import tag
-
 from configurations.models import XDSConfiguration
 from core.models import (CourseDetailHighlight, CourseSpotlight, Experience,
                          InterestList, SearchFilter, SearchSortOption,
                          XDSUIConfiguration)
+from django.test import tag
 from users.models import XDSUser
 
 from .test_setup import TestSetUp

app/es_api/tests/test_utils_unit.py

@@ -1,11 +1,10 @@
 import json
 from unittest.mock import Mock, patch
 
-from django.test import TestCase, tag
-from elasticsearch_dsl import Q, Search
-
 from configurations.models import XDSConfiguration, XDSUIConfiguration
 from core.models import CourseSpotlight, SearchFilter, SearchSortOption
+from django.test import TestCase, tag
+from elasticsearch_dsl import Q, Search
 from es_api.utils.queries import XSEQueries
 from es_api.utils.queries_base import BaseQueries
 from users.models import Organization, XDSUser

app/es_api/urls.py

@@ -1,7 +1,6 @@
 from django.urls import path
-from rest_framework.routers import DefaultRouter
-
 from es_api import views
+from rest_framework.routers import DefaultRouter
 
 router = DefaultRouter()
 

app/es_api/utils/queries.py

@@ -2,12 +2,11 @@
 import json
 import logging
 
+from configurations.models import CourseInformationMapping, XDSConfiguration
+from core.models import CourseSpotlight, SearchFilter, SearchSortOption
 from django.core.exceptions import ObjectDoesNotExist
 from elasticsearch_dsl import A, Document, Q
 from elasticsearch_dsl.query import MoreLikeThis
-
-from configurations.models import CourseInformationMapping, XDSConfiguration
-from core.models import CourseSpotlight, SearchFilter, SearchSortOption
 from users.models import Organization
 
 from .queries_base import BaseQueries

app/es_api/views.py

@@ -1,17 +1,16 @@
 import json
 import logging
 
+from configurations.models import CourseInformationMapping, XDSConfiguration
+from core.models import SearchFilter
 from django.http import (HttpResponse, HttpResponseBadRequest,
                          HttpResponseServerError)
+from es_api.utils.queries import XSEQueries
 from requests.exceptions import HTTPError
 from rest_framework import status
 from rest_framework.response import Response
 from rest_framework.views import APIView
 
-from configurations.models import CourseInformationMapping, XDSConfiguration
-from core.models import SearchFilter
-from es_api.utils.queries import XSEQueries
-
 logger = logging.getLogger('dict_config_logger')
 
 

app/users/tests/test_models_unit.py

@@ -1,6 +1,5 @@
 from django.core.exceptions import ValidationError
 from django.test import tag
-
 from users.models import (LowercaseValidator, NumberValidator, Organization,
                           SymbolValidator, UppercaseValidator, XDSUser)
 

app/users/tests/test_setup.py

@@ -1,10 +1,9 @@
 from unittest.mock import patch
 
-from openlxp_notifications.models import email
-from rest_framework.test import APITestCase
-
 from configurations.models import XDSConfiguration
 from core.models import Experience, InterestList, SavedFilter
+from openlxp_notifications.models import email
+from rest_framework.test import APITestCase
 from users.models import XDSUser
 
 

app/users/tests/test_views_unit.py

@@ -3,7 +3,6 @@
 from django.test import tag
 from django.urls import reverse
 from rest_framework import status
-
 from users.models import XDSUser
 from users.serializers import XDSUserSerializer
 

app/xds_api/serializers.py

@@ -1,10 +1,9 @@
 import logging
 
-from rest_framework import serializers
-
 from configurations.models import CourseInformationMapping
 from core.models import (CourseDetailHighlight, Experience, InterestList,
                          SavedFilter, SearchSortOption)
+from rest_framework import serializers
 from users.serializers import XDSUserSerializer
 
 logger = logging.getLogger('dict_config_logger')

app/xds_api/tests/test_setup.py

@@ -1,10 +1,9 @@
 from unittest.mock import patch
 
-from openlxp_notifications.models import email
-from rest_framework.test import APITestCase
-
 from configurations.models import XDSConfiguration
 from core.models import Experience, InterestList, SavedFilter
+from openlxp_notifications.models import email
+from rest_framework.test import APITestCase
 from users.models import XDSUser
 
 

app/xds_api/tests/test_views_unit.py

@@ -1,6 +1,8 @@
 import json
 from unittest.mock import Mock, patch
 
+from configurations.models import XDSConfiguration
+from core.models import CourseSpotlight, InterestList, SavedFilter
 from django.contrib.auth.models import Permission
 from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import ObjectDoesNotExist
@@ -9,9 +11,6 @@
 from requests.exceptions import HTTPError, RequestException
 from rest_framework import status
 
-from configurations.models import XDSConfiguration
-from core.models import CourseSpotlight, InterestList, SavedFilter
-
 from .test_setup import TestSetUp
 
 

app/xds_api/tests/test_xds_utils_unit.py

@@ -1,10 +1,9 @@
 import json
 from unittest.mock import patch
 
-from django.test import TestCase, tag
-
 from configurations.models import XDSConfiguration
 from core.models import CourseSpotlight, Experience
+from django.test import TestCase, tag
 from xds_api.utils.xds_utils import (get_spotlight_courses_api_url,
                                      metadata_to_target, save_experiences)
 

app/xds_api/urls.py

@@ -1,6 +1,5 @@
 from django.urls import path
 from rest_framework.routers import DefaultRouter
-
 from xds_api import views
 
 router = DefaultRouter()

app/xds_api/utils/xds_utils.py

@@ -1,11 +1,10 @@
 import json
 
 import requests
-from rest_framework import status
-from rest_framework.response import Response
-
 from configurations.models import XDSConfiguration
 from core.models import CourseSpotlight, Experience
+from rest_framework import status
+from rest_framework.response import Response
 
 
 def get_request(request_url):

app/xds_api/views.py

@@ -3,16 +3,15 @@
 from collections import OrderedDict
 
 import requests
+from configurations.models import XDSConfiguration
+from core.management.utils.xds_internal import bleach_data_to_json
+from core.models import CourseSpotlight, Experience, InterestList, SavedFilter
 from django.core.exceptions import ObjectDoesNotExist
 from django.http import HttpResponse, HttpResponseServerError
 from requests.exceptions import HTTPError
 from rest_framework import status
 from rest_framework.response import Response
 from rest_framework.views import APIView
-
-from configurations.models import XDSConfiguration
-from core.management.utils.xds_internal import bleach_data_to_json
-from core.models import CourseSpotlight, Experience, InterestList, SavedFilter
 from xds_api.serializers import InterestListSerializer, SavedFilterSerializer
 from xds_api.utils.xds_utils import (get_request,
                                      get_spotlight_courses_api_url,

requirements.txt

@@ -46,4 +46,6 @@ Pillow>=10.3.0, <10.4.0
 
 python-slugify>=8.0.1
 
+sort-requirements==1.3.0
+
 text-unidecode>=1.3