Merge pull request #88 from aisa-it/fix/BUGS-1169

fix BUGS-1169

Author: EgorSheff

aiplan.go/cmd/aiplan/triggers.sql

@@ -276,6 +276,7 @@ BEGIN
                 'name', i.name,
                 'sequence_id', i.sequence_id,
                 'project', i.project_id,
+                'workspace', i.workspace_id,
                 'created_by', i.created_by_id
             ) END
         ) INTO payload

aiplan.go/internal/aiplan/notifications/email-service.go

@@ -480,7 +480,7 @@ func (es *EmailService) MessageNotify(notification dao.DeferredNotifications, ms
 }
 
 func (es *EmailService) DeadlineMessageNotify(user dao.User, notification dao.DeferredNotifications, nd notifyDeadline) error {
-	subject := fmt.Sprintf("Уведомление об истечении срока выполнения задачи: %s-%d", notification.Issue.Project.Identifier, notification.Issue.SequenceId)
+	subject := fmt.Sprintf("Уведомление об истечении срока выполнения задачи: %s-%d", notification.Project.Identifier, notification.Issue.SequenceId)
 
 	loc := time.Location(user.UserTimezone)
 	date := nd.Deadline.In(&loc)

aiplan.go/internal/aiplan/notifications/notification_processor.go

@@ -415,7 +415,8 @@ func (nd *notifyDeadline) getUserNotification() *dao.UserNotifications {
 func (nd *notifyDeadline) toTelegram(notification *dao.DeferredNotifications, author *dao.User) (tgId int64, format string, any []any) {
 	formatMsg := "❗Срок выполнения задачи\n[%s](%s)\nистекает *%s*"
 	var out []interface{}
-
+	notification.Issue.Project = notification.Project
+	notification.Issue.SetUrl()
 	date, err := FormatDate(nd.Deadline.Format("02.01.2006 15:04 MST"), "02.01.2006 15:04 MST", &notification.User.UserTimezone)
 	if err != nil {
 		return 0, "", nil
@@ -429,6 +430,8 @@ func (nd *notifyDeadline) toTelegram(notification *dao.DeferredNotifications, au
 }
 
 func (nd *notifyDeadline) toEmail(emailService *EmailService, notification *dao.DeferredNotifications, author *dao.User) bool {
+	notification.Issue.Workspace = notification.Workspace
+	notification.Issue.SetUrl()
 	err := emailService.DeadlineMessageNotify(*notification.User, *notification, *nd)
 	if err != nil {
 		return false

aiplan.go/internal/aiplan/notifications/tg/tg.go

@@ -149,7 +149,7 @@ func isReplyMessage(update *models.Update) bool {
 
 func (t *TgService) SendMessage(tgId int64, format string, anyStr []any) bool {
 	msg := NewTgMsg()
-	msg.title = Stelegramf(format, anyStr)
+	msg.title = Stelegramf(format, anyStr...)
 	_, err := t.Send(tgId, msg)
 	if err != nil {
 		slog.Error("Sending message to Telegram:", "error", err)