From 85a8b6bd0eea1d5b72718d3cc64135a43c69aad2 Mon Sep 17 00:00:00 2001
From: Aji Kamaludin <aji19kamaludin@gmail.com>
Date: Tue, 17 Aug 2021 20:39:30 +0700
Subject: [PATCH] fix date on select query

---
 src/services/postgres/CategoriesService.js | 2 +-
 src/services/postgres/ProductsService.js   | 2 +-
 src/services/postgres/PurchasesService.js  | 2 +-
 src/services/postgres/SalesService.js      | 2 +-
 src/services/postgres/UnitsService.js      | 2 +-
 src/services/postgres/UsersService.js      | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/services/postgres/CategoriesService.js b/src/services/postgres/CategoriesService.js
index 304f496..3069886 100644
--- a/src/services/postgres/CategoriesService.js
+++ b/src/services/postgres/CategoriesService.js
@@ -10,7 +10,7 @@ class CategoriesService {
 
   async getCategories(companyId, { startDate, endDate }) {
     const query = {
-      text: 'SELECT id, name, description FROM categories WHERE company_id = $1 AND created_at BETWEEN $2 AND $3',
+      text: 'SELECT id, name, description FROM categories WHERE company_id = $1 AND created_at::DATE BETWEEN $2 AND $3',
       values: [companyId, startDate, endDate],
     };
 
diff --git a/src/services/postgres/ProductsService.js b/src/services/postgres/ProductsService.js
index ce4858f..6ed7ca0 100644
--- a/src/services/postgres/ProductsService.js
+++ b/src/services/postgres/ProductsService.js
@@ -14,7 +14,7 @@ class ProductsService {
       text: `SELECT 
               id, name, description, price, cost
             FROM products
-            WHERE company_id = $1 AND created_at BETWEEN $2 AND $3`,
+            WHERE company_id = $1 AND created_at::DATE BETWEEN $2 AND $3`,
       values: [companyId, startDate, endDate],
     };
 
diff --git a/src/services/postgres/PurchasesService.js b/src/services/postgres/PurchasesService.js
index 01af31f..d1efd2e 100644
--- a/src/services/postgres/PurchasesService.js
+++ b/src/services/postgres/PurchasesService.js
@@ -56,7 +56,7 @@ class PurchasesService {
             LEFT JOIN offices ON offices.id = purchases.office_id
             WHERE 
               purchases.office_id = (SELECT id FROM offices WHERE company_id = $1 LIMIT 1) 
-            AND date BETWEEN $2 AND $3`,
+            AND date::DATE BETWEEN $2 AND $3`,
       values: [companyId, startDate, endDate],
     };
 
diff --git a/src/services/postgres/SalesService.js b/src/services/postgres/SalesService.js
index a6c6af2..9d28243 100644
--- a/src/services/postgres/SalesService.js
+++ b/src/services/postgres/SalesService.js
@@ -72,7 +72,7 @@ class SalesService {
             LEFT JOIN offices ON offices.id = sales.office_id
             WHERE 
               sales.office_id = (SELECT id FROM offices WHERE company_id = $1 LIMIT 1) 
-            AND date BETWEEN $2 AND $3`,
+            AND date::DATE BETWEEN $2 AND $3`,
       values: [companyId, startDate, endDate],
     };
 
diff --git a/src/services/postgres/UnitsService.js b/src/services/postgres/UnitsService.js
index c7c9b6b..d6ad8c1 100644
--- a/src/services/postgres/UnitsService.js
+++ b/src/services/postgres/UnitsService.js
@@ -10,7 +10,7 @@ class UnitsService {
 
   async getUnits(companyId, { startDate, endDate }) {
     const query = {
-      text: 'SELECT id, name, description FROM units WHERE company_id = $1 AND created_at BETWEEN $2 AND $3',
+      text: 'SELECT id, name, description FROM units WHERE company_id = $1 AND created_at::DATE BETWEEN $2 AND $3',
       values: [companyId, startDate, endDate],
     };
 
diff --git a/src/services/postgres/UsersService.js b/src/services/postgres/UsersService.js
index eb9d520..1e0e5f3 100644
--- a/src/services/postgres/UsersService.js
+++ b/src/services/postgres/UsersService.js
@@ -66,7 +66,7 @@ class UsersService {
   async getUsers(companyId, { startDate, endDate }) {
     // TODO: implement pagination leter
     const query = {
-      text: 'SELECT name, email, role FROM users WHERE company_id = $1 AND created_at BETWEEN $2 AND $3',
+      text: 'SELECT name, email, role FROM users WHERE company_id = $1 AND created_at::DATE BETWEEN $2 AND $3',
       values: [companyId, startDate, endDate],
     };