test(zone): getZoneClosing() front and back

modules/zone/back/methods/zone/getZoneClosing.js

@@ -45,7 +45,6 @@ module.exports = Self => {
                         DISTINCT z.id,
                         z.name,
                         am.name agencyModeName,
-                        type,
                         IFNULL(ze.hour, z.hour) as hour,
                         IFNULL(ze.price, z.price) as price
                     FROM vn.zone z
@@ -62,7 +61,6 @@ module.exports = Self => {
                 GROUP BY z.id
                 `;
 
-        const zones = await Self.rawSql(query, paramsSql, myOptions);
+        return await Self.rawSql(query, paramsSql, myOptions);
-        return zones;
     };
 };

modules/zone/back/methods/zone/specs/getZoneClosing.spec.js

@@ -0,0 +1,23 @@
+const models = require('vn-loopback/server/server').models;
+
+describe('zone getZoneClosing()', () => {
+    it('should return closing time of zones', async() => {
+        const tx = await models.Zone.beginTransaction({});
+
+        try {
+            const options = {transaction: tx};
+            const date = new Date();
+            const today = date.toISOString().split('T')[0];
+
+            const result = await models.Zone.getZoneClosing([1, 2, 3], today, options);
+
+            expect(result.length).toEqual(3);
+            expect(result[0].hour).toBeDefined();
+
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
+    });
+});

modules/zone/front/delivery-days/index.js

@@ -81,9 +81,7 @@ class Controller extends Section {
         };
 
         this.$http.post(`Zones/getZoneClosing`, params)
-            .then(res => {
+            .then(res => this.zoneClosing = res.data);
-                this.zoneClosing = res.data;
-            });
     }
 
     preview(zone) {

modules/zone/front/delivery-days/index.spec.js

@@ -96,12 +96,14 @@ describe('Zone Component vnZoneDeliveryDays', () => {
             expect(controller.$.zoneEvents.show).not.toHaveBeenCalled();
         });
 
-        xit('should call the show() method and call getZoneClosing with the expected ids', () => {
+        it('should call the show() method and call getZoneClosing() with the expected ids', () => {
             jest.spyOn(controller.$.zoneEvents, 'show');
 
             const event = new Event('click');
             const target = document.createElement('div');
             target.dispatchEvent(event);
+
+            const day = new Date();
             const events = [
                 {zoneFk: 1},
                 {zoneFk: 2},
@@ -111,12 +113,14 @@ describe('Zone Component vnZoneDeliveryDays', () => {
                 zonesId: [1, 2, 8],
                 date: [day][0]
             };
-            const day = new Date();
+            const response = [{id: 1, hour: ''}];
-            $httpBackend.expect('POST', 'Zones/getZoneClosing', params).respond({});
+
+            $httpBackend.when('POST', 'Zones/getZoneClosing', params).respond({response});
             controller.onSelection(event, events, [day]);
+            $httpBackend.flush();
 
             expect(controller.$.zoneEvents.show).toHaveBeenCalledWith(target);
-            expect(controller.zoneClosing).toBeDefined();
+            expect(controller.zoneClosing.id).toEqual(response.id);
         });
     });
 });