From b660072ca1c56f058d89b9fd8db6af1fdfb67acb Mon Sep 17 00:00:00 2001 From: Dmitriy_Kravchenko Date: Thu, 2 Jul 2026 09:06:44 +0300 Subject: [PATCH] completed task error fix --- internal/bitrix/bitrix.go | 14 ++++++++++++-- main.go | 2 +- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/internal/bitrix/bitrix.go b/internal/bitrix/bitrix.go index 89dd846..3f084b5 100644 --- a/internal/bitrix/bitrix.go +++ b/internal/bitrix/bitrix.go @@ -721,10 +721,16 @@ func (s *Service) GetCRMElementTitles( type taskListResponse struct { Tasks []struct { - ID int `json:"id,string"` + ID int `json:"id,string"` + Status int `json:"status,string"` } `json:"tasks"` } +const ( + TaskStatusSupposedly = 4 // ждет контроля + TaskStatusCompleted = 5 // завершена +) + func (s *Service) CompleteSubtasks(ctx context.Context, taskID int) error { // Получаем список подзадач var resp taskListResponse @@ -736,7 +742,7 @@ func (s *Service) CompleteSubtasks(ctx context.Context, taskID int) error { "filter": map[string]interface{}{ "PARENT_ID": taskID, }, - "select": []string{"ID"}, + "select": []string{"ID", "STATUS"}, }, &resp, ) @@ -746,6 +752,10 @@ func (s *Service) CompleteSubtasks(ctx context.Context, taskID int) error { // Завершаем каждую подзадачу for _, task := range resp.Tasks { + if task.Status == TaskStatusCompleted || task.Status == TaskStatusSupposedly { + continue + } + if err := s.call( ctx, "tasks.task.complete", diff --git a/main.go b/main.go index 38e8054..eb3b2f2 100644 --- a/main.go +++ b/main.go @@ -108,7 +108,7 @@ func processNewTaskEvent(ctx context.Context, event *BitrixEvent, mandatoryAudit bitrixService.SetTaskAuditors(ctx, event.GetTaskId(), auditorIDS) - if taskInfo.CreatorID == taskInfo.ResponsibleID && taskInfo.ParentID == 0 { + if taskInfo.CreatorID == taskInfo.ResponsibleID && taskInfo.ParentID != 0 { return nil }