add date from date to

This commit is contained in:
Aditya Siregar 2025-08-05 23:02:42 +07:00
parent 073681d4d5
commit 11d814ab2f

View File

@ -186,7 +186,6 @@ func ListOrdersQueryToModel(query *contract.ListOrdersQuery) *models.ListOrdersR
Limit: query.Limit, Limit: query.Limit,
} }
// Parse UUID fields
if query.OrganizationID != "" { if query.OrganizationID != "" {
if organizationID, err := uuid.Parse(query.OrganizationID); err == nil { if organizationID, err := uuid.Parse(query.OrganizationID); err == nil {
req.OrganizationID = &organizationID req.OrganizationID = &organizationID
@ -227,7 +226,6 @@ func ListOrdersQueryToModel(query *contract.ListOrdersQuery) *models.ListOrdersR
req.PaymentStatus = &paymentStatus req.PaymentStatus = &paymentStatus
} }
// Parse boolean fields
if query.IsVoid != "" { if query.IsVoid != "" {
if isVoid, err := strconv.ParseBool(query.IsVoid); err == nil { if isVoid, err := strconv.ParseBool(query.IsVoid); err == nil {
req.IsVoid = &isVoid req.IsVoid = &isVoid
@ -240,19 +238,23 @@ func ListOrdersQueryToModel(query *contract.ListOrdersQuery) *models.ListOrdersR
} }
} }
// Parse date fields
if query.DateFrom != "" { if query.DateFrom != "" {
if dateFrom, err := time.Parse("2006-01-02", query.DateFrom); err == nil { if dateFrom, err := time.Parse(ddmmyyyy, query.DateFrom); err == nil {
req.DateFrom = &dateFrom req.DateFrom = &dateFrom
} }
} }
if query.DateTo != "" { if query.DateTo != "" {
if dateTo, err := time.Parse("2006-01-02", query.DateTo); err == nil { if dateTo, err := time.Parse(ddmmyyyy, query.DateTo); err == nil {
req.DateTo = &dateTo req.DateTo = &dateTo
} }
} }
if query.DateFrom == query.DateTo {
newDate := req.DateTo.AddDate(0, 0, 1)
req.DateTo = &newDate
}
return req return req
} }