Merge pull request #30 from aisa-it/fix/targetDateFormat

fix target dete format

Author: EgorSheff

aiplan.go/internal/aiplan/activity-tracker/update.go

@@ -3,6 +3,8 @@ package tracker
 
 import (
 	"fmt"
+	"github.com/aisa-it/aiplan/aiplan.go/internal/aiplan/types"
+	"time"
 
 	"github.com/aisa-it/aiplan/aiplan.go/internal/aiplan/dao"
 	"github.com/aisa-it/aiplan/aiplan.go/internal/aiplan/utils"
@@ -330,6 +332,15 @@ func entityColorUpdate[E dao.Entity, A dao.Activity](tracker *ActivitiesTracker,
 //   - []A: список обновленных Activity (если произошла ошибка, возвращает nil и ошибку).
 //   - error: ошибка, произошедшая при обновлении (если произошла ошибка, возвращает nil).
 func entityTargetDateUpdate[E dao.Entity, A dao.Activity](tracker *ActivitiesTracker, requestedData map[string]interface{}, currentInstance map[string]interface{}, entity E, actor dao.User) ([]A, error) {
+	if v, ok := requestedData["target_date"]; ok && v != nil {
+		currentTZ := types.TimeZone(*time.Local)
+		d, _ := utils.FormatDateStr(v.(string), "02.01.2006 15:04 MST", &currentTZ)
+		requestedData["target_date"] = d
+	}
+	if v, ok := currentInstance["target_date"]; ok && v != nil {
+		d, _ := utils.FormatDateStr(v.(string), "02.01.2006 15:04 MST", nil)
+		currentInstance["target_date"] = d
+	}
 	return entityFieldUpdate[E, A]("target_date", nil, nil, tracker, requestedData, currentInstance, entity, actor)
 }
 

aiplan.go/internal/aiplan/http-issue.go

@@ -1016,14 +1016,14 @@ func (s *Services) updateIssue(c echo.Context) error {
 	var targetDate *string
 	if val, ok := data["target_date"]; ok {
 		if issue.TargetDate != nil {
-			if date, err := utils.FormatDateStr(issue.TargetDate.String(), "02.01.2006 15:04 -0700", nil); err != nil {
+			if date, err := utils.FormatDateStr(issue.TargetDate.String(), "2006-01-02 15:04:05Z07:00", nil); err != nil {
 				return EErrorDefined(c, apierrors.ErrGeneric)
 			} else {
 				issueMapOld["target_date_activity_val"] = date
 			}
 		}
 		if val != nil {
-			date, err := utils.FormatDateStr(val.(string), "02.01.2006 15:04 -0700", nil)
+			date, err := utils.FormatDateStr(val.(string), "2006-01-02 15:04:05Z07:00", nil)
 			if err != nil {
 				return EErrorDefined(c, apierrors.ErrGeneric)
 			}

aiplan.go/internal/aiplan/notifications/tg-issue-activity.go

@@ -290,8 +290,8 @@ func (tni *TgNotifyIssue) LogActivity(activity dao.IssueActivity) {
 						oldValue = capitalizeFirst(oldValue)
 						newValue = capitalizeFirst(newValue)
 					} else if *activity.Field == "target_date" {
-						newT, err := FormatDate(newValue, "02.01.2006", nil)
-						oldValue, _ = FormatDate(oldValue, "02.01.2006", nil)
+						newT, err := FormatDate(newValue, "02.01.2006 15:04 MST", nil)
+						oldValue, _ = FormatDate(oldValue, "02.01.2006 15:04 MST", nil)
 						if newValue == "<nil>" {
 							newValue = ""
 						}

aiplan.go/internal/aiplan/notifications/util.go

@@ -84,6 +84,7 @@ func FormatDate(dateStr, outFormat string, tz *types.TimeZone) (string, error) {
 		"02.01.2006 15:04 MST",
 		"02.01.2006 15:04 -0700",
 		"02.01.2006",
+		"2006-01-02 15:04:05Z07:00",
 	}
 
 	var t time.Time

aiplan.go/internal/aiplan/utils/utils.go

@@ -253,12 +253,15 @@ func FormatDate(dateStr string) (time.Time, error) {
 		"2006-01-02T15:04:05",
 		"2006-01-02T15:04:05.000Z",
 		"2006-01-02T15:04:05Z07:00",
+		"2006-01-02 15:04:05Z07:00",
 		"2006-01-02 15:04:05",
 		"2006-01-02 15:04:05 -0700 MST",
 		"2006-01-02",
 		"02.01.2006 15:04 MST",
 		"02.01.2006 15:04 -0700",
 		"02.01.2006",
+		"2006-01-02 15:04:05-07",
+		"2006-01-02 15:04:05 -0700",
 	}
 
 	var t time.Time