Merge pull request '#7677 - return more postcode fields' (!2865) from 7677_vnLocation_perf into dev

Reviewed-on: #2865
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

back/methods/postcode/specs/filter.spec.js

@@ -29,7 +29,7 @@ describe('Postcode filter()', () => {
                 }
             }, options);
 
-            expect(results.length).toEqual(4);
+            expect(results.length).toEqual(5);
             await tx.rollback();
         } catch (e) {
             await tx.rollback();
@@ -63,7 +63,7 @@ describe('Postcode filter()', () => {
                 search: 'one',
             }}, options);
 
-            expect(results.length).toEqual(4);
+            expect(results.length).toEqual(5);
             await tx.rollback();
         } catch (e) {
             await tx.rollback();

db/dump/fixtures.before.sql

@@ -361,11 +361,12 @@ INSERT INTO `vn`.`town`(`id`, `name`, `provinceFk`)
 
 INSERT INTO `vn`.`postCode`(`code`, `townFk`, `geoFk`)
     VALUES
-        ('46000', 		1, 6),
+        ('46000', 1, 6),
-        ('46460', 		2, 6),
+        ('46460', 2, 6),
-        ('46680', 		3, 6),
+        ('46680', 3, 6),
-        ('46600', 		4, 7),
+        ('46600', 4, 7),
-        ('EC170150', 	5, 8);
+        ('46600',1, 6),
+        ('EC170150', 5, 8);
 
 INSERT INTO `vn`.`clientType`(`code`, `type`)
     VALUES

modules/client/back/models/address.js

@@ -43,8 +43,14 @@ module.exports = Self => {
             include: [{
                 relation: 'province',
                 scope: {
-                    fields: ['id', 'name']
+                    fields: ['id', 'name', 'countryFk'],
-                }
+                    include: [
+                        {
+                            relation: 'country',
+                            scope: {fields: ['id', 'name']},
+                        },
+                    ],
+                },
             }, {
                 relation: 'agencyMode',
                 scope: {