SQuiz/amocrm
2
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

changes after local testing

Browse Source
This commit is contained in:
Pavel 2024-06-12 18:10:44 +03:00
parent 3f033e3a5f
commit 85371f47db
4 changed files with 4 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
internal/controllers/initial.go
View File

@ -31,9 +31,6 @@ func NewController(deps Deps) *Controller {
func (c *Controller) Register(router fiber.Router) {
router.Patch("/users", c.UpdateListUsers)
router.Get("/users", c.GettingUserWithPagination)
//router.Delete("/utms/:quizID", c.DeletingUserUtm)
//router.Post("/utms/:quizID", c.SavingUserUtm)
//router.Get("/utms/:quizID", c.GettingUserUtm)
router.Delete("/account", c.SoftDeleteAccount)
router.Get("/account", c.GetCurrentAccount)
router.Post("/account", c.ConnectAccount)

71
internal/controllers/utm.go
View File

@ -1,71 +0,0 @@
package controllers
//func (c *Controller) DeletingUserUtm(ctx *fiber.Ctx) error {
// var request model.ListDeleteUTMIDsReq
// if err := ctx.BodyParser(&request); err != nil {
// return ctx.Status(fiber.StatusBadRequest).JSON(fiber.Map{"error": "Invalid request payload"})
// }
//
// err := c.service.DeletingUserUtm(ctx.Context(), &request)
// if err != nil {
// return ctx.Status(fiber.StatusInternalServerError).SendString("Internal Server Error")
// }
// return ctx.SendStatus(fiber.StatusOK)
//}
//
//func (c *Controller) SavingUserUtm(ctx *fiber.Ctx) error {
// accountID, ok := middleware.GetAccountId(ctx)
// if !ok {
// return ctx.Status(fiber.StatusUnauthorized).SendString("account id is required")
// }
// quizID := ctx.Params("quizID")
// if quizID == "" {
// return ctx.Status(fiber.StatusBadRequest).SendString("quizID is nil")
// }
//
// quizIDInt, err := strconv.Atoi(quizID)
// if err != nil {
// return ctx.Status(fiber.StatusBadRequest).SendString("failed convert quizID to int")
// }
//
// var request model.SaveUserListUTMReq
// if err := ctx.BodyParser(&request); err != nil {
// return ctx.Status(fiber.StatusBadRequest).JSON(fiber.Map{"error": "Invalid request payload"})
// }
//
// response, err := c.service.SavingUserUtm(ctx.Context(), &request, accountID, quizIDInt)
//
// if err != nil {
// return ctx.Status(fiber.StatusInternalServerError).SendString("Internal Server Error")
// }
// return ctx.Status(fiber.StatusOK).JSON(response)
//}
//
//func (c *Controller) GettingUserUtm(ctx *fiber.Ctx) error {
// accountID, ok := middleware.GetAccountId(ctx)
// if !ok {
// return ctx.Status(fiber.StatusUnauthorized).SendString("account id is required")
// }
//
// quizID := ctx.Params("quizID")
// if quizID == "" {
// return ctx.Status(fiber.StatusBadRequest).SendString("quizID is nil")
// }
//
// quizIDInt, err := strconv.Atoi(quizID)
// if err != nil {
// return ctx.Status(fiber.StatusBadRequest).SendString("failed convert quizID to int")
// }
//
// req, err := extractParams(ctx)
// if err != nil {
// return err
// }
//
// response, err := c.service.GettingUserUtm(ctx.Context(), req, accountID, quizIDInt)
//
// if err != nil {
// return ctx.Status(fiber.StatusInternalServerError).SendString("Internal Server Error")
// }
// return ctx.Status(fiber.StatusOK).JSON(response)
//}

4
internal/workers_methods/methods.go
View File

@ -120,8 +120,8 @@ func (m *Methods) CheckUsers(ctx context.Context, allTokens []model.Token) error
for _, user := range users {
found := false
for _, currentUser := range currentUserUsers {
found = true
if user.ID == currentUser.AmoUserID {
found = true
err := m.repo.AmoRepo.UpdateAmoAccountUser(ctx, model.AmoAccountUser{
AmoID: currentUser.AmoID,
AmoUserID: currentUser.AmoUserID,
@ -156,7 +156,7 @@ func (m *Methods) CheckUsers(ctx context.Context, allTokens []model.Token) error
for _, currentUserUser := range currentUserUsers {
found := false
for _, user := range users {
if currentUserUser.AmoID == user.ID {
if currentUserUser.AmoUserID == user.ID {
found = true
break
}

4
pkg/amoClient/amo_test.go
View File

@ -105,12 +105,12 @@ func Test_GetUserInfo(t *testing.T) {
}
func Test_DealGet(t *testing.T) {
url := "https://penadigitaltech.amocrm.ru/api/v4/leads/44545733"
url := "https://penadigitaltech.amocrm.ru/api/v4/leads/44599925"
client := fiber.AcquireClient()
agent := client.Get(url)
agent.Set("Authorization", "Bearer "+"eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiIsImp0aSI6IjQxNjM4YTA3YjJkMzI5ZmJlMGJjNTlkMjlhZDFiYmJkZmQ5NDdlYTczYjc2YzkwYjliNDRiN2Q4YzdiOTZjMWE3Mjk1ZWJhNmQ2MjM3MzJjIn0.eyJhdWQiOiIyZGJkNjMyOS05YmU2LTQxZjItYWE1Zi05NjRiOWU3MjNlNDkiLCJqdGkiOiI0MTYzOGEwN2IyZDMyOWZiZTBiYzU5ZDI5YWQxYmJiZGZkOTQ3ZWE3M2I3NmM5MGI5YjQ0YjdkOGM3Yjk2YzFhNzI5NWViYTZkNjIzNzMyYyIsImlhdCI6MTcxNzgxOTIwMiwibmJmIjoxNzE3ODE5MjAyLCJleHAiOjE3MTc5MDU2MDIsInN1YiI6Ijg0MTM5NjkiLCJncmFudF90eXBlIjoiIiwiYWNjb3VudF9pZCI6MzAyMjg5OTcsImJhc2VfZG9tYWluIjoiYW1vY3JtLnJ1IiwidmVyc2lvbiI6Miwic2NvcGVzIjpbInB1c2hfbm90aWZpY2F0aW9ucyIsImZpbGVzIiwiY3JtIiwibm90aWZpY2F0aW9ucyJdLCJoYXNoX3V1aWQiOiI2NTAwNzFmNi04YzhhLTRlMzgtYWQyOC04YmEzMTgyN2Q2ZmQifQ.aXKe3crb56NIj9RBCrzb40jHxfE6e04kMnCZNnYmhjo2WPeStYBeb4meuIDFpskS6bGG_LRmExVmKOR4OnqWvV0wBXpOUrH0nvD_-NPkAiZbNh3viJFCqBJVfao5BEwC8SfcV2u235kgWcTcvk-nvrPUDuCcldF0bOrszACI3d5nDXxoiwgu9jTpuRq88CvxGHvAEECDrRWSsD6WTPMJmR6iIevn79zkC9nh_JC3Ph4_-waRSL3CbVNXFCXoAnD8Py8A1LCFlt9pRW6SXOopIOe25VgklTUkbDG1sPlFZneXqKpcJ72qPvLE7AKWaWkCSydvtAcNTnBLP7sgLUA4tA")
agent.Set("Authorization", "Bearer "+"eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiIsImp0aSI6IjdjYjVlZDEwNzE1MDAyOWQ3ZjkyN2VjZGQ1YzZhN2ZjODQ2MmIyOTk3NTczZjU1YTRjMmYyYmEwZjI5M2FmZTRhYWE2YzA0ODliOWY3NzRjIn0.eyJhdWQiOiIyZGJkNjMyOS05YmU2LTQxZjItYWE1Zi05NjRiOWU3MjNlNDkiLCJqdGkiOiI3Y2I1ZWQxMDcxNTAwMjlkN2Y5MjdlY2RkNWM2YTdmYzg0NjJiMjk5NzU3M2Y1NWE0YzJmMmJhMGYyOTNhZmU0YWFhNmMwNDg5YjlmNzc0YyIsImlhdCI6MTcxODE5NTA0MiwibmJmIjoxNzE4MTk1MDQyLCJleHAiOjE3MTgyODE0NDIsInN1YiI6IjgxMTA3MjYiLCJncmFudF90eXBlIjoiIiwiYWNjb3VudF9pZCI6MzAyMjg5OTcsImJhc2VfZG9tYWluIjoiYW1vY3JtLnJ1IiwidmVyc2lvbiI6Miwic2NvcGVzIjpbInB1c2hfbm90aWZpY2F0aW9ucyIsImZpbGVzIiwiY3JtIiwibm90aWZpY2F0aW9ucyJdLCJoYXNoX3V1aWQiOiJhMjk4YzEyMC1hZDViLTRlYTMtOGI0My04ODhlNTMwZDA5OTMifQ.FUb-GD_6bQ1YHUtqeUIGe3ONmKdq7fLpDCOKreXXu2rKdgQD5ZZlXnqr9MHzKDddk2crZaKkPalsv4XMfvKN6Z9zvyBab61xTn3vQ4whjbRCjqbmVJ2Is3yMHeLJ_tp_qT3Ta2Xe-qOoNBTTqY8yR3T2SaRfLf-5lijZ5yU2lYQ8s68Q2qRrISVxrptH8jt3u1spS5W48P1lD9LdJ9FfxubTH8h1SiHf_1i51Sg5Y6Kpmu9ojHW6MwJRcE4BYTa4lMneTz7ogHMD2Bc7pWJE_lxbAfr6OTPbV7tjfv8IHM0v4qiGgYzC9unusTipvu50HF-YT3ZwyohmMR-CrXDq_g")
statusCode, resBody, errs := agent.Bytes()
if len(errs) > 0 {