asv-hlps 1.3.35 → 1.3.36

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/lib/cjs/npms/typeorm.js +24 -15
  2. package/lib/esm/npms/typeorm.js +24 -15
  3. package/package.json +1 -1
package/lib/cjs/npms/typeorm.js CHANGED
@@ -10,6 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
10
10
  };
11
11
  Object.defineProperty(exports, "__esModule", { value: true });
12
12
  exports.getModelArrayRefs = exports.tormDateParams = void 0;
13
+ const utils_1 = require("../utils");
13
14
  /**
14
15
  *
15
16
  * @param qb typeorm queryselectoer
@@ -39,10 +40,6 @@ const tormDateParams = (qb, propColumn, opDates, dates, datesBy) => {
39
40
  break;
40
41
  }
41
42
  if (dates) {
42
- console.log("------ dates ------");
43
- console.log(dates);
44
- console.log(datesBy);
45
- console.log("------ dates ------");
46
43
  if (!datesBy) {
47
44
  qb.andWhere(`DATE_FORMAT(${propColumn}, '%Y-%m-%d') BETWEEN CAST(:fromDate as date) AND CAST(:toDate as date)`, {
48
45
  fromDate: dates.fromDate,
@@ -50,18 +47,30 @@ const tormDateParams = (qb, propColumn, opDates, dates, datesBy) => {
50
47
  });
51
48
  }
52
49
  else {
53
- switch (datesBy) {
54
- case "month":
55
- qb.andWhere(`DATE_FORMAT(${propColumn}, '%Y-%m') BETWEEN CAST(:fromDate as date) AND CAST(:toDate as date)`, {
56
- fromDate: dates.fromDate,
57
- toDate: dates.toDate,
58
- });
59
- case "year":
60
- qb.andWhere(`DATE_FORMAT(${propColumn}, '%Y') BETWEEN CAST(:fromDate as date) AND CAST(:toDate as date)`, {
61
- fromDate: dates.fromDate,
62
- toDate: dates.toDate,
63
- });
50
+ if (datesBy === "month") {
51
+ qb.andWhere(`DATE_FORMAT(${propColumn}, "%Y-%m") BETWEEN :fromDate AND :toDate `, {
52
+ fromDate: (0, utils_1.dateFormatter)(dates.fromDate, "ym", "-"),
53
+ toDate: (0, utils_1.dateFormatter)(dates.toDate, "ym", "-"),
54
+ });
64
55
  }
56
+ if (datesBy === "year") {
57
+ qb.andWhere(`DATE_FORMAT(${propColumn}, "%Y") BETWEEN :fromDate AND :toDate `, {
58
+ fromDate: (0, utils_1.dateFormatter)(dates.fromDate, "y"),
59
+ toDate: (0, utils_1.dateFormatter)(dates.toDate, "y"),
60
+ });
61
+ }
62
+ /* switch (datesBy) {
63
+ case "month":
64
+ qb.andWhere(`DATE_FORMAT(${propColumn}, '%Y-%m') BETWEEN CAST(:fromDate as date) AND CAST(:toDate as date)`, {
65
+ fromDate: dates.fromDate,
66
+ toDate: dates.toDate,
67
+ });
68
+ case "year":
69
+ qb.andWhere(`DATE_FORMAT(${propColumn}, '%Y') BETWEEN CAST(:fromDate as date) AND CAST(:toDate as date)`, {
70
+ fromDate: dates.fromDate,
71
+ toDate: dates.toDate,
72
+ });
73
+ } */
65
74
  }
66
75
  }
67
76
  };
package/lib/esm/npms/typeorm.js CHANGED
@@ -7,6 +7,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
7
7
  step((generator = generator.apply(thisArg, _arguments || [])).next());
8
8
  });
9
9
  };
10
+ import { dateFormatter } from "../utils";
10
11
  /**
11
12
  *
12
13
  * @param qb typeorm queryselectoer
@@ -36,10 +37,6 @@ export const tormDateParams = (qb, propColumn, opDates, dates, datesBy) => {
36
37
  break;
37
38
  }
38
39
  if (dates) {
39
- console.log("------ dates ------");
40
- console.log(dates);
41
- console.log(datesBy);
42
- console.log("------ dates ------");
43
40
  if (!datesBy) {
44
41
  qb.andWhere(`DATE_FORMAT(${propColumn}, '%Y-%m-%d') BETWEEN CAST(:fromDate as date) AND CAST(:toDate as date)`, {
45
42
  fromDate: dates.fromDate,
@@ -47,18 +44,30 @@ export const tormDateParams = (qb, propColumn, opDates, dates, datesBy) => {
47
44
  });
48
45
  }
49
46
  else {
50
- switch (datesBy) {
51
- case "month":
52
- qb.andWhere(`DATE_FORMAT(${propColumn}, '%Y-%m') BETWEEN CAST(:fromDate as date) AND CAST(:toDate as date)`, {
53
- fromDate: dates.fromDate,
54
- toDate: dates.toDate,
55
- });
56
- case "year":
57
- qb.andWhere(`DATE_FORMAT(${propColumn}, '%Y') BETWEEN CAST(:fromDate as date) AND CAST(:toDate as date)`, {
58
- fromDate: dates.fromDate,
59
- toDate: dates.toDate,
60
- });
47
+ if (datesBy === "month") {
48
+ qb.andWhere(`DATE_FORMAT(${propColumn}, "%Y-%m") BETWEEN :fromDate AND :toDate `, {
49
+ fromDate: dateFormatter(dates.fromDate, "ym", "-"),
50
+ toDate: dateFormatter(dates.toDate, "ym", "-"),
51
+ });
61
52
  }
53
+ if (datesBy === "year") {
54
+ qb.andWhere(`DATE_FORMAT(${propColumn}, "%Y") BETWEEN :fromDate AND :toDate `, {
55
+ fromDate: dateFormatter(dates.fromDate, "y"),
56
+ toDate: dateFormatter(dates.toDate, "y"),
57
+ });
58
+ }
59
+ /* switch (datesBy) {
60
+ case "month":
61
+ qb.andWhere(`DATE_FORMAT(${propColumn}, '%Y-%m') BETWEEN CAST(:fromDate as date) AND CAST(:toDate as date)`, {
62
+ fromDate: dates.fromDate,
63
+ toDate: dates.toDate,
64
+ });
65
+ case "year":
66
+ qb.andWhere(`DATE_FORMAT(${propColumn}, '%Y') BETWEEN CAST(:fromDate as date) AND CAST(:toDate as date)`, {
67
+ fromDate: dates.fromDate,
68
+ toDate: dates.toDate,
69
+ });
70
+ } */
62
71
  }
63
72
  }
64
73
  };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "asv-hlps",
3
- "version": "1.3.35",
3
+ "version": "1.3.36",
4
4
  "description": "helpers",
5
5
  "main": "./lib/cjs/index.js",
6
6
  "module": "./lib/esm/index.js",