diff --git a/go.mod b/go.mod index 7f2664b..520a946 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,7 @@ require ( github.com/rs/xid v1.6.0 github.com/twmb/franz-go v1.17.1 go.uber.org/zap v1.27.0 - penahub.gitlab.yandexcloud.net/backend/quiz/common.git v0.0.0-20241024123151-c50ea6a734b3 + penahub.gitlab.yandexcloud.net/backend/quiz/common.git v0.0.0-20241024141027-0c6f373d187c penahub.gitlab.yandexcloud.net/devops/linters/golang.git v0.0.0-20240829220549-d35409b619a3 ) diff --git a/go.sum b/go.sum index 665c362..adc2ff6 100644 --- a/go.sum +++ b/go.sum @@ -141,7 +141,7 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= penahub.gitlab.yandexcloud.net/backend/penahub_common v0.0.0-20240202120244-c4ef330cfe5d h1:gbaDt35HMDqOK84WYmDIlXMI7rstUcRqNttaT6Kx1do= penahub.gitlab.yandexcloud.net/backend/penahub_common v0.0.0-20240202120244-c4ef330cfe5d/go.mod h1:lTmpjry+8evVkXWbEC+WMOELcFkRD1lFMc7J09mOndM= -penahub.gitlab.yandexcloud.net/backend/quiz/common.git v0.0.0-20241024123151-c50ea6a734b3 h1:gEIjVpxxr74y+5pDtJAIpjk+YD8Fj/7ZpuX0RHELpnk= -penahub.gitlab.yandexcloud.net/backend/quiz/common.git v0.0.0-20241024123151-c50ea6a734b3/go.mod h1:uOuosXduBzd2WbLH6TDZO7ME7ZextulA662oZ6OsoB0= +penahub.gitlab.yandexcloud.net/backend/quiz/common.git v0.0.0-20241024141027-0c6f373d187c h1:wViTf9OITkoGW/H5zB9kNIxDeEAPaoPOXZRhgtRTDU4= +penahub.gitlab.yandexcloud.net/backend/quiz/common.git v0.0.0-20241024141027-0c6f373d187c/go.mod h1:uOuosXduBzd2WbLH6TDZO7ME7ZextulA662oZ6OsoB0= penahub.gitlab.yandexcloud.net/devops/linters/golang.git v0.0.0-20240829220549-d35409b619a3 h1:sf6e2mp582L3i/FMDd2q6QuWm1njRXzYpIX0SipsvM4= penahub.gitlab.yandexcloud.net/devops/linters/golang.git v0.0.0-20240829220549-d35409b619a3/go.mod h1:i7M72RIpkSjcQtHID6KKj9RT/EYZ1rxS6tIPKWa/BSY= diff --git a/internal/workers/post_deals_worker/deals_worker.go b/internal/workers/post_deals_worker/deals_worker.go index 1d75dd5..fed7f5a 100644 --- a/internal/workers/post_deals_worker/deals_worker.go +++ b/internal/workers/post_deals_worker/deals_worker.go @@ -407,6 +407,7 @@ func (wc *DealsWorker) constructField(ctx context.Context, request interface{}, fmt.Println("dealFields", dealFields) dealReq.Fields.CompanyID = companyID dealReq.Fields.ContactIDs = append(dealReq.Fields.ContactIDs, contactID) + //dealFields["UF_CRM_1729778229491"] = "UF_CRM_1729778229491" reqMap = models.FormattingToMap(&dealReq, dealFields) } diff --git a/pkg/bitrixClient/bitrix.go b/pkg/bitrixClient/bitrix.go index 91f8639..efb829b 100644 --- a/pkg/bitrixClient/bitrix.go +++ b/pkg/bitrixClient/bitrix.go @@ -869,14 +869,15 @@ func (b *Bitrix) DownLoadFile(urlFile string) (string, string, error) { return fileName[len(fileName)-1], resBodyBase64, nil } +// scope crm do not have privileges func (b *Bitrix) AddedTagCustomField(accessToken string, domain string) error { for { if b.rateLimiter.Check() { uri := fmt.Sprintf("https://%s/rest/userfieldtype.add", domain) req := models.UserFieldTypeAddReq{ - UserTypeID: string(model.FieldTypePenaTag), - Handler: "http://10.8.0.18:1492", // todo заменить на что то реальное + UserTypeID: string(model.PenaTagCustomFieldsType), + Handler: "https://b24-s5jg6c.bitrix24.ru", // todo заменить на что то реальное Title: "Кастомный тип пользовательского поля Pena", Description: "Кастомный тип пользовательского поля Pena", } diff --git a/pkg/bitrixClient/bitrix_test.go b/pkg/bitrixClient/bitrix_test.go index eb7e8d0..5a83f8f 100644 --- a/pkg/bitrixClient/bitrix_test.go +++ b/pkg/bitrixClient/bitrix_test.go @@ -48,7 +48,7 @@ func TestGetListFields(t *testing.T) { //} // fieldAnswer := make(map[string]string) - fieldAnswer["UF_CRM_1729669958"] = "хуйхуйхуйхухй" + fieldAnswer["UF_CRM_1729778229491"] = "хуйхуйхуйхухй" // //createContactReq := models.CreateContactReq{ @@ -114,7 +114,7 @@ func TestGetListFields(t *testing.T) { // reqMap := models.FormattingToMap(&createDealReq, fieldAnswer) fmt.Println(reqMap) - result, err := b.CreatingDeal(reqMap, "8ec218670000071b0072541200000001000007d0047b935d30b9acc0cbd5d0202b8711", "b24-s5jg6c.bitrix24.ru") + result, err := b.CreatingDeal(reqMap, "e16b1a670000071b007254120000000100000759485bd49a2206c79f84e8a150522f43", "b24-s5jg6c.bitrix24.ru") if err != nil { fmt.Println(err) } @@ -272,7 +272,7 @@ func Test_AddedTagCustomField(t *testing.T) { RateLimiter: lim, }) - err := b.AddedTagCustomField("5a521a670000071b0072541200000001000007f51a1183c55658b6e1e0b42ba48cf3fa", "b24-s5jg6c.bitrix24.ru") + err := b.AddedTagCustomField("e16b1a670000071b007254120000000100000759485bd49a2206c79f84e8a150522f43", "b24-s5jg6c.bitrix24.ru") if err != nil { fmt.Println(err) }