Merge branch 'sort-updated' of 'https://github.com/evamillan/grimoirelab-sortinghat'

Merges #505
Closes #505
Fixes #488

Author: sduenas

sortinghat/core/models.py

@@ -176,6 +176,7 @@ class Individual(EntityBase):
 
     class Meta:
         db_table = 'individuals'
+        ordering = ('last_modified',)
 
     def __str__(self):
         return self.mk

sortinghat/core/schema.py

@@ -35,6 +35,7 @@
 from django_rq import enqueue
 
 from graphene.types.generic import GenericScalar
+from graphene.utils.str_converters import to_snake_case
 
 from graphene_django.converter import convert_django_field
 from graphene_django.types import DjangoObjectType
@@ -776,7 +777,8 @@ class SortingHatQuery:
         IdentityPaginatedType,
         page_size=graphene.Int(),
         page=graphene.Int(),
-        filters=IdentityFilterType(required=False)
+        filters=IdentityFilterType(required=False),
+        order_by=graphene.String(required=False),
     )
     transactions = graphene.Field(
         TransactionPaginatedType,
@@ -839,8 +841,9 @@ def resolve_organizations(self, info, filters=None,
     def resolve_individuals(self, info, filters=None,
                             page=1,
                             page_size=settings.DEFAULT_GRAPHQL_PAGE_SIZE,
+                            order_by='mk',
                             **kwargs):
-        query = Individual.objects.order_by('mk')
+        query = Individual.objects.order_by(to_snake_case(order_by))
 
         if filters and 'uuid' in filters:
             indv_uuid = filters['uuid']

tests/test_schema.py

@@ -450,6 +450,13 @@
   }
 }
 """
+SH_INDIVIDUALS_ORDER_BY = """{
+  individuals(orderBy: "%s") {
+    entities {
+      mk
+    }
+  }
+}"""
 SH_TRANSACTIONS_QUERY = """{
   transactions {
     entities {
@@ -2437,6 +2444,53 @@ def test_filter_country(self):
         indv = individuals[0]
         self.assertEqual(indv['profile']['country']['name'], 'United States of America')
 
+    def test_order_by_last_modified(self):
+        """Check whether it returns the individuals ordered by last modified date"""
+
+        indv1 = Individual.objects.create(mk='a9b403e150dd4af8953a52a4bb841051e4b705d9')
+        indv2 = Individual.objects.create(mk='185c4b709e5446d250b4fde0e34b78a2b4fde0e3')
+        indv3 = Individual.objects.create(mk='c6d2504fde0e34b78a185c4b709e5442d045451c')
+
+        # Test default order by mk
+        client = graphene.test.Client(schema)
+        executed = client.execute(SH_INDIVIDUALS_ORDER_BY % 'mk',
+                                  context_value=self.context_value)
+
+        individuals = executed['data']['individuals']['entities']
+
+        indv = individuals[0]
+        self.assertEqual(indv['mk'], indv2.mk)
+        indv = individuals[1]
+        self.assertEqual(indv['mk'], indv1.mk)
+        indv = individuals[2]
+        self.assertEqual(indv['mk'], indv3.mk)
+
+        # Test ascending order
+        executed = client.execute(SH_INDIVIDUALS_ORDER_BY % 'lastModified',
+                                  context_value=self.context_value)
+
+        individuals = executed['data']['individuals']['entities']
+
+        indv = individuals[0]
+        self.assertEqual(indv['mk'], indv1.mk)
+        indv = individuals[1]
+        self.assertEqual(indv['mk'], indv2.mk)
+        indv = individuals[2]
+        self.assertEqual(indv['mk'], indv3.mk)
+
+        # Test descending order
+        executed = client.execute(SH_INDIVIDUALS_ORDER_BY % '-lastModified',
+                                  context_value=self.context_value)
+
+        individuals = executed['data']['individuals']['entities']
+
+        indv = individuals[0]
+        self.assertEqual(indv['mk'], indv3.mk)
+        indv = individuals[1]
+        self.assertEqual(indv['mk'], indv2.mk)
+        indv = individuals[2]
+        self.assertEqual(indv['mk'], indv1.mk)
+
     def test_pagination(self):
         """Check whether it returns the individuals searched when using pagination"""
 

ui/package.json

@@ -41,7 +41,7 @@
     "@vue/cli-plugin-vuex": "~4.3.0",
     "@vue/cli-service": "~4.3.0",
     "@vue/eslint-config-prettier": "^6.0.0",
-    "@vue/test-utils": "1.0.0-beta.31",
+    "@vue/test-utils": "1.1.2",
     "babel-eslint": "^10.1.0",
     "babel-preset-vue": "^2.0.2",
     "deepmerge": "^4.2.2",

ui/src/apollo/queries.js

@@ -98,8 +98,14 @@ const GET_PAGINATED_INDIVIDUALS = gql`
     $page: Int!
     $pageSize: Int!
     $filters: IdentityFilterType
+    $orderBy: String
   ) {
-    individuals(page: $page, pageSize: $pageSize, filters: $filters) {
+    individuals(
+      page: $page
+      pageSize: $pageSize
+      filters: $filters
+      orderBy: $orderBy
+    ) {
       entities {
         mk
         isLocked
@@ -231,13 +237,20 @@ const getIndividuals = {
   }
 };
 
-const getPaginatedIndividuals = (apollo, currentPage, pageSize, filters) => {
+const getPaginatedIndividuals = (
+  apollo,
+  currentPage,
+  pageSize,
+  filters,
+  orderBy
+) => {
   let response = apollo.query({
     query: GET_PAGINATED_INDIVIDUALS,
     variables: {
       page: currentPage,
       pageSize: pageSize,
-      filters: filters
+      filters: filters,
+      orderBy: orderBy
     },
     fetchPolicy: "no-cache"
   });

ui/src/components/IndividualsTable.vue

@@ -35,6 +35,7 @@
         class="ml-auto pa-0 flex-grow-0"
         @search="filterSearch"
         filter-selector
+        order-selector
       />
       <v-tooltip bottom transition="expand-y-transition" open-delay="200">
         <template v-slot:activator="{ on }">
@@ -287,7 +288,8 @@ export default {
       },
       totalResults: 0,
       itemsPerPage: 10,
-      allSelected: false
+      allSelected: false,
+      orderBy: null
     };
   },
   computed: {
@@ -317,9 +319,18 @@ export default {
     this.queryIndividuals(1);
   },
   methods: {
-    async queryIndividuals(page = this.page, filters = this.filters) {
+    async queryIndividuals(
+      page = this.page,
+      filters = this.filters,
+      orderBy = this.orderBy
+    ) {
       if (this.disabledSearch) return;
-      let response = await this.fetchPage(page, this.itemsPerPage, filters);
+      let response = await this.fetchPage(
+        page,
+        this.itemsPerPage,
+        filters,
+        orderBy
+      );
       if (response) {
         this.individuals = formatIndividuals(
           response.data.individuals.entities
@@ -503,8 +514,9 @@ export default {
         this.$logger.error(`Error updating enrollment: ${error}`, data);
       }
     },
-    filterSearch(filters) {
+    filterSearch(filters, orderBy) {
       this.filters = filters;
+      this.orderBy = orderBy;
       this.queryIndividuals(1);
     },
     selectAll(value) {

ui/src/components/Search.stories.js

@@ -7,7 +7,11 @@ export default {
 
 const searchTemplate = `
   <div class="ma-5">
-    <search :valid-filters="validFilters" :filter-selector="filterSelector" />
+    <search
+      :valid-filters="validFilters"
+      :filter-selector="filterSelector"
+      :order-selector="orderSelector"
+    />
   </div>
 `;
 
@@ -16,7 +20,8 @@ export const Default = () => ({
   template: searchTemplate,
   data: () => ({
     validFilters: [],
-    filterSelector: false
+    filterSelector: false,
+    orderSelector: false
   })
 });
 
@@ -34,6 +39,17 @@ export const filterSelector = () => ({
         type: "boolean"
       }
     ],
-    filterSelector: true
+    filterSelector: true,
+    orderSelector: false
+  })
+});
+
+export const orderSelector = () => ({
+  components: { Search },
+  template: searchTemplate,
+  data: () => ({
+    orderSelector: true,
+    validFilters: [],
+    filterSelector: false
   })
 });