From 88db78992ef90f62bcc9aad32c79927a8de36e68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Franc=C3=A9=20Wilke?= <francewilke@gmail.com>
Date: Wed, 22 Jan 2025 13:51:23 +0200
Subject: [PATCH] Export db_utils functions
---
db_utils/db_utils.go | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/db_utils/db_utils.go b/db_utils/db_utils.go
index e80f5f6..2187355 100644
--- a/db_utils/db_utils.go
+++ b/db_utils/db_utils.go
@@ -20,7 +20,7 @@ const (
Yesterday string = "^yesterday$"
)
-func checkAbsoluteRegex(regex string, value string) bool {
+func CheckAbsoluteRegex(regex string, value string) bool {
matchesRegex, err := regexp.Match(regex, []byte(value))
if matchesRegex && err == nil {
return true
@@ -29,7 +29,7 @@ func checkAbsoluteRegex(regex string, value string) bool {
return false
}
-func pullAbsoluteValue(value string) int64 {
+func PullAbsoluteValue(value string) int64 {
reg, err := regexp.Compile("[a-zA-Z]+")
if err != nil {
return 0
@@ -45,32 +45,32 @@ func AbsoluteDateStringQuery(absolute string) string {
var value int64
timeNow := date_utils.CurrentDate()
- if checkAbsoluteRegex(LastXHours, absolute) {
- value = pullAbsoluteValue(absolute)
+ if CheckAbsoluteRegex(LastXHours, absolute) {
+ value = PullAbsoluteValue(absolute)
since := timeNow.Add(time.Duration(-value) * time.Hour)
return fmt.Sprintf(" >= '%v'", date_utils.DateDBFormattedString(since))
}
- if checkAbsoluteRegex(LastDay, absolute) {
+ if CheckAbsoluteRegex(LastDay, absolute) {
startDay := time.Date(timeNow.Year(), timeNow.Month(), timeNow.Day(), 0, 0, 0, 0, date_utils.CurrentLocation())
endDay := time.Date(timeNow.Year(), timeNow.Month(), timeNow.Day(), 23, 59, 59, 999999999, date_utils.CurrentLocation())
return fmt.Sprintf(" BETWEEN '%v' AND '%v'", date_utils.DateDBFormattedString(startDay), date_utils.DateDBFormattedString(endDay))
}
- if checkAbsoluteRegex(LastXDays, absolute) {
- value = pullAbsoluteValue(absolute)
+ if CheckAbsoluteRegex(LastXDays, absolute) {
+ value = PullAbsoluteValue(absolute)
since := timeNow.AddDate(0, 0, -int(value))
return fmt.Sprintf(" >= '%v'", date_utils.DateDBFormattedString(since))
}
- if checkAbsoluteRegex(LastMonth, absolute) {
+ if CheckAbsoluteRegex(LastMonth, absolute) {
firstOfMonth := time.Date(timeNow.Year(), timeNow.Month(), 1, 0, 0, 0, 0, date_utils.CurrentLocation())
lastDay := firstOfMonth.AddDate(0, 1, -1)
lastOfMonth := time.Date(lastDay.Year(), lastDay.Month(), lastDay.Day(), 23, 59, 59, 999999999, date_utils.CurrentLocation())
return fmt.Sprintf(" BETWEEN '%v' AND '%v'", date_utils.DateDBFormattedString(firstOfMonth), date_utils.DateDBFormattedString(lastOfMonth))
}
- if checkAbsoluteRegex(Yesterday, absolute) {
+ if CheckAbsoluteRegex(Yesterday, absolute) {
yesterday := timeNow.AddDate(0, 0, -1)
startDay := time.Date(yesterday.Year(), yesterday.Month(), yesterday.Day(), 0, 0, 0, 0, date_utils.CurrentLocation())
endDay := time.Date(yesterday.Year(), yesterday.Month(), yesterday.Day(), 23, 59, 59, 999999999, date_utils.CurrentLocation())
--
GitLab