From c824f10dc021d075085c5af925c916de4c0d19a1 Mon Sep 17 00:00:00 2001 From: Pavel Date: Thu, 26 Sep 2024 11:19:51 +0300 Subject: [PATCH] - --- go.mod | 46 +++++++++--- go.sum | 112 ++++++++++++++++++++++++++-- internal/models/createCompany.go | 6 -- internal/models/getListFields.go | 74 +++++------------- internal/models/getListPipelines.go | 23 ++---- internal/models/getListSteps.go | 42 ++++------- pkg/bitrixClient/bitrix.go | 25 ++++--- pkg/bitrixClient/bitrix_test.go | 85 +++++++++------------ 8 files changed, 228 insertions(+), 185 deletions(-) diff --git a/go.mod b/go.mod index a7237a4..8592a14 100644 --- a/go.mod +++ b/go.mod @@ -3,27 +3,53 @@ module penahub.gitlab.yandexcloud.net/backend/quiz/bitrix go 1.23.1 require ( + github.com/caarlos0/env/v8 v8.0.0 + github.com/go-redis/redis/v8 v8.11.5 + github.com/gofiber/fiber/v2 v2.52.5 + github.com/joho/godotenv v1.5.1 + github.com/lib/pq v1.10.9 + 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-20240926081605-f7dda8704dbf + penahub.gitlab.yandexcloud.net/devops/linters/golang.git v0.0.0-20240829220549-d35409b619a3 +) + +require ( + github.com/ClickHouse/clickhouse-go v1.5.4 // indirect github.com/andybalholm/brotli v1.0.5 // indirect - github.com/caarlos0/env/v8 v8.0.0 // indirect github.com/cespare/xxhash/v2 v2.1.2 // indirect + github.com/cloudflare/golz4 v0.0.0-20150217214814-ef862a3cdc58 // indirect github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect - github.com/go-redis/redis/v8 v8.11.5 // indirect - github.com/gofiber/fiber/v2 v2.52.5 // indirect + github.com/dustin/go-humanize v1.0.1 // indirect + github.com/golang-jwt/jwt/v5 v5.2.0 // indirect + github.com/golang/protobuf v1.5.3 // indirect github.com/google/uuid v1.6.0 // indirect - github.com/joho/godotenv v1.5.1 // indirect + github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.17.8 // indirect + github.com/klauspost/cpuid/v2 v2.2.6 // indirect github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.20 // indirect github.com/mattn/go-runewidth v0.0.15 // indirect + github.com/minio/md5-simd v1.1.2 // indirect + github.com/minio/minio-go/v7 v7.0.69 // indirect + github.com/minio/sha256-simd v1.0.1 // indirect + github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect + github.com/modern-go/reflect2 v1.0.2 // indirect + github.com/pierrec/lz4/v4 v4.1.21 // indirect github.com/rivo/uniseg v0.2.0 // indirect - github.com/twmb/franz-go v1.17.1 // indirect + github.com/rs/xid v1.5.0 // indirect + github.com/tealeg/xlsx v1.0.5 // indirect + github.com/themakers/hlog v0.0.0-20191205140925-235e0e4baddf // indirect + github.com/twmb/franz-go/pkg/kmsg v1.8.0 // indirect github.com/valyala/bytebufferpool v1.0.0 // indirect github.com/valyala/fasthttp v1.51.0 // indirect github.com/valyala/tcplisten v1.0.0 // indirect - github.com/whatcrm/go-bitrix24 v0.0.0-20240703130346-26bf63825ffc // indirect go.uber.org/multierr v1.10.0 // indirect - go.uber.org/zap v1.27.0 // indirect - golang.org/x/sys v0.17.0 // indirect - penahub.gitlab.yandexcloud.net/backend/quiz/common.git v0.0.0-20240916081736-fd38f78b3686 // indirect - penahub.gitlab.yandexcloud.net/devops/linters/golang.git v0.0.0-20240829220549-d35409b619a3 // indirect + golang.org/x/crypto v0.23.0 // indirect + golang.org/x/net v0.21.0 // indirect + golang.org/x/sys v0.20.0 // indirect + golang.org/x/text v0.15.0 // indirect + google.golang.org/protobuf v1.33.0 // indirect + gopkg.in/ini.v1 v1.67.0 // indirect + penahub.gitlab.yandexcloud.net/backend/penahub_common v0.0.0-20240202120244-c4ef330cfe5d // indirect ) diff --git a/go.sum b/go.sum index f4af220..7ffcd62 100644 --- a/go.sum +++ b/go.sum @@ -1,21 +1,59 @@ +github.com/ClickHouse/clickhouse-go v1.5.4 h1:cKjXeYLNWVJIx2J1K6H2CqyRmfwVJVY1OV1coaaFcI0= +github.com/ClickHouse/clickhouse-go v1.5.4/go.mod h1:EaI/sW7Azgz9UATzd5ZdZHRUhHgv5+JMS9NSr2smCJI= github.com/andybalholm/brotli v1.0.5 h1:8uQZIdzKmjc/iuPu7O2ioW48L81FgatrcpfFmiq/cCs= github.com/andybalholm/brotli v1.0.5/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= +github.com/bkaradzic/go-lz4 v1.0.0 h1:RXc4wYsyz985CkXXeX04y4VnZFGG8Rd43pRaHsOXAKk= +github.com/bkaradzic/go-lz4 v1.0.0/go.mod h1:0YdlkowM3VswSROI7qDxhRvJ3sLhlFrRRwjwegp5jy4= github.com/caarlos0/env/v8 v8.0.0 h1:POhxHhSpuxrLMIdvTGARuZqR4Jjm8AYmoi/JKlcScs0= github.com/caarlos0/env/v8 v8.0.0/go.mod h1:7K4wMY9bH0esiXSSHlfHLX5xKGQMnkH5Fk4TDSSSzfo= github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE= github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/cloudflare/golz4 v0.0.0-20150217214814-ef862a3cdc58 h1:F1EaeKL/ta07PY/k9Os/UFtwERei2/XzGemhpGnBKNg= +github.com/cloudflare/golz4 v0.0.0-20150217214814-ef862a3cdc58/go.mod h1:EOBUe0h4xcZ5GoxqC5SDxFQ8gwyZPKQoEzownBlhI80= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= +github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= +github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= +github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= +github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/go-redis/redis/v8 v8.11.5 h1:AcZZR7igkdvfVmQTPnu9WE37LRrO/YrBH5zWyjDC0oI= github.com/go-redis/redis/v8 v8.11.5/go.mod h1:gREzHqY1hg6oD9ngVRbLStwAWKhA0FEgq8Jd4h5lpwo= +github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= github.com/gofiber/fiber/v2 v2.52.5 h1:tWoP1MJQjGEe4GB5TUGOi7P2E0ZMMRx5ZTG4rT+yGMo= github.com/gofiber/fiber/v2 v2.52.5/go.mod h1:KEOE+cXMhXG0zHc9d8+E38hoX+ZN7bhOtgeF2oT6jrQ= +github.com/golang-jwt/jwt/v5 v5.2.0 h1:d/ix8ftRUorsN+5eMIlF4T6J8CAt9rch3My2winC1Jw= +github.com/golang-jwt/jwt/v5 v5.2.0/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk= +github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= +github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/jmoiron/sqlx v1.2.0/go.mod h1:1FEQNm3xlJgrMD+FBdI9+xvCksHtbpVBBw5dYhBSsks= github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0= github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= +github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= +github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/klauspost/compress v1.17.8 h1:YcnTYrq7MikUT7k0Yb5eceMmALQPYBW/Xltxn0NAMnU= github.com/klauspost/compress v1.17.8/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= +github.com/klauspost/cpuid/v2 v2.0.1/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= +github.com/klauspost/cpuid/v2 v2.2.6 h1:ndNyv040zDGIDh8thGkXYjnFtiN02M1PVVF+JE/48xc= +github.com/klauspost/cpuid/v2 v2.2.6/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= +github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= +github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw= +github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= @@ -23,29 +61,87 @@ github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWE github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U= github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= +github.com/mattn/go-sqlite3 v1.9.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= +github.com/minio/md5-simd v1.1.2 h1:Gdi1DZK69+ZVMoNHRXJyNcxrMA4dSxoYHZSQbirFg34= +github.com/minio/md5-simd v1.1.2/go.mod h1:MzdKDxYpY2BT9XQFocsiZf/NKVtR7nkE4RoEpN+20RM= +github.com/minio/minio-go/v7 v7.0.69 h1:l8AnsQFyY1xiwa/DaQskY4NXSLA2yrGsW5iD9nRPVS0= +github.com/minio/minio-go/v7 v7.0.69/go.mod h1:XAvOPJQ5Xlzk5o3o/ArO2NMbhSGkimC+bpW/ngRKDmQ= +github.com/minio/sha256-simd v1.0.1 h1:6kaan5IFmwTNynnKKpDHe6FWHohJOHhCPchzK49dzMM= +github.com/minio/sha256-simd v1.0.1/go.mod h1:Pz6AKMiUdngCLpeTL/RJY1M9rUuPMYujV5xJjtbRSN8= +github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= +github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= +github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= +github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= +github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= +github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= +github.com/onsi/gomega v1.18.1 h1:M1GfJqGRrBrrGGsbxzV5dqM2U2ApXefZCQpkukxYRLE= +github.com/onsi/gomega v1.18.1/go.mod h1:0q+aL8jAiMXy9hbwj2mr5GziHiwhAIQpFmmtT5hitRs= +github.com/pierrec/lz4 v2.0.5+incompatible h1:2xWsjqPFWcplujydGg4WmhC/6fZqK42wMM8aXeqhl0I= +github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= +github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ= +github.com/pierrec/lz4/v4 v4.1.21/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY= github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= +github.com/rs/xid v1.5.0 h1:mKX4bl4iPYJtEIxp6CYiUuLQ/8DYMoz0PUdtGgMFRVc= +github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/tealeg/xlsx v1.0.5 h1:+f8oFmvY8Gw1iUXzPk+kz+4GpbDZPK1FhPiQRd+ypgE= +github.com/tealeg/xlsx v1.0.5/go.mod h1:btRS8dz54TDnvKNosuAqxrM1QgN1udgk9O34bDCnORM= +github.com/themakers/hlog v0.0.0-20191205140925-235e0e4baddf h1:TJJm6KcBssmbWzplF5lzixXl1RBAi/ViPs1GaSOkhwo= +github.com/themakers/hlog v0.0.0-20191205140925-235e0e4baddf/go.mod h1:1FsorU3vnXO9xS9SrhUp8fRb/6H/Zfll0rPt1i4GWaA= github.com/twmb/franz-go v1.17.1 h1:0LwPsbbJeJ9R91DPUHSEd4su82WJWcTY1Zzbgbg4CeQ= github.com/twmb/franz-go v1.17.1/go.mod h1:NreRdJ2F7dziDY/m6VyspWd6sNxHKXdMZI42UfQ3GXM= +github.com/twmb/franz-go/pkg/kmsg v1.8.0 h1:lAQB9Z3aMrIP9qF9288XcFf/ccaSxEitNA1CDTEIeTA= +github.com/twmb/franz-go/pkg/kmsg v1.8.0/go.mod h1:HzYEb8G3uu5XevZbtU0dVbkphaKTHk0X68N5ka4q6mU= github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= github.com/valyala/fasthttp v1.51.0 h1:8b30A5JlZ6C7AS81RsWjYMQmrZG6feChmgAolCl1SqA= github.com/valyala/fasthttp v1.51.0/go.mod h1:oI2XroL+lI7vdXyYoQk03bXBThfFl2cVdIA3Xl7cH8g= github.com/valyala/tcplisten v1.0.0 h1:rBHj/Xf+E1tRGZyWIWwJDiRY0zc1Js+CV5DqwacVSA8= github.com/valyala/tcplisten v1.0.0/go.mod h1:T0xQ8SeCZGxckz9qRXTfG43PvQ/mcWh7FwZEA7Ioqkc= -github.com/whatcrm/go-bitrix24 v0.0.0-20240703130346-26bf63825ffc h1:uXmnvLKLuXQO/CSRounbydYylpr8gzWuoxTzdf5Bp/4= -github.com/whatcrm/go-bitrix24 v0.0.0-20240703130346-26bf63825ffc/go.mod h1:iZNaUPr5Ir6LvhXCCf5Xf0U45h07QvCkqN5ixZAk5y8= +go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= +go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= go.uber.org/multierr v1.10.0 h1:S0h4aNzvfcFsC3dRF1jLoaov7oRaKqRGC/pUEJ2yvPQ= go.uber.org/multierr v1.10.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8= go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= +golang.org/x/crypto v0.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI= +golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8= +golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4= +golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y= -golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -penahub.gitlab.yandexcloud.net/backend/quiz/common.git v0.0.0-20240909215939-bd8d1262c9b4 h1:yzHodIke5UPFpmonfqU6pvIBqn5pcvrBtiIRolg8vo8= -penahub.gitlab.yandexcloud.net/backend/quiz/common.git v0.0.0-20240909215939-bd8d1262c9b4/go.mod h1:uOuosXduBzd2WbLH6TDZO7ME7ZextulA662oZ6OsoB0= -penahub.gitlab.yandexcloud.net/backend/quiz/common.git v0.0.0-20240916081736-fd38f78b3686 h1:RZHe7jHbIpkzg+Wk8Vb/hlI4JnGKZ9Cs+UNCxlA7Joc= -penahub.gitlab.yandexcloud.net/backend/quiz/common.git v0.0.0-20240916081736-fd38f78b3686/go.mod h1:uOuosXduBzd2WbLH6TDZO7ME7ZextulA662oZ6OsoB0= +golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= +golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk= +golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= +google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= +google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA= +gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= +gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= +gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= +gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= +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-20240926081605-f7dda8704dbf h1:Tnhg4SypUiQP/s5hd9AE6LQ38mABe070czaa5xjuIu8= +penahub.gitlab.yandexcloud.net/backend/quiz/common.git v0.0.0-20240926081605-f7dda8704dbf/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/models/createCompany.go b/internal/models/createCompany.go index 17460c3..3f4a288 100644 --- a/internal/models/createCompany.go +++ b/internal/models/createCompany.go @@ -16,9 +16,3 @@ type CompanyFields struct { UtmTerm string `json:"UTM_TERM"` ContactID int32 `json:"CONTACT_ID"` } - -type CompanyType string - -const ( - CompanyTypeCustomer CompanyType = "customer" -) diff --git a/internal/models/getListFields.go b/internal/models/getListFields.go index 24f667d..924e4d0 100644 --- a/internal/models/getListFields.go +++ b/internal/models/getListFields.go @@ -1,74 +1,36 @@ package models import ( + "penahub.gitlab.yandexcloud.net/backend/quiz/common.git/model" "strconv" "time" ) -type FieldsType string - -const ( - FieldTypeLead FieldsType = "CRM_LEAD" - FieldTypeCompany FieldsType = "CRM_COMPANY" - FieldTypeContact FieldsType = "CRM_CONTACT" - FieldTypeDeal FieldsType = "CRM_DEAL" - FieldTypeInvoiceOld FieldsType = "CRM_INVOICE" - FieldTypeInvoiceNew FieldsType = "CRM_SMART_INVOICE" - FieldTypeQuote FieldsType = "CRM_QUOTE" - FieldTypeRequisite FieldsType = "CRM_REQUISITE" -) - type FieldsResponse struct { Result []Fields `json:"result"` Total int `json:"total"` } type Fields struct { - ID string `json:"ID"` - EntityID string `json:"ENTITY_ID"` - FieldName string `json:"FIELD_NAME"` - UserTypeID string `json:"USER_TYPE_ID"` - XMLID string `json:"XML_ID"` - Sort string `json:"SORT"` - Multiple string `json:"MULTIPLE"` - Mandatory string `json:"MANDATORY"` - ShowFilter string `json:"SHOW_FILTER"` - ShowInList string `json:"SHOW_IN_LIST"` - EditInList string `json:"EDIT_IN_LIST"` - IsSearchable string `json:"IS_SEARCHABLE"` - EditFormLabel string `json:"EDIT_FORM_LABEL"` - ListColumnLabel string `json:"LIST_COLUMN_LABEL"` - ListFilterLabel string `json:"LIST_FILTER_LABEL"` - ErrorMessage string `json:"ERROR_MESSAGE"` - HelpMessage string `json:"HELP_MESSAGE"` + ID string `json:"ID"` + EntityID model.FieldsType `json:"ENTITY_ID"` + FieldName string `json:"FIELD_NAME"` + UserTypeID string `json:"USER_TYPE_ID"` + XMLID string `json:"XML_ID"` + Sort string `json:"SORT"` + Multiple string `json:"MULTIPLE"` + Mandatory string `json:"MANDATORY"` + ShowFilter string `json:"SHOW_FILTER"` + ShowInList string `json:"SHOW_IN_LIST"` + EditInList string `json:"EDIT_IN_LIST"` + IsSearchable string `json:"IS_SEARCHABLE"` + EditFormLabel string `json:"EDIT_FORM_LABEL"` + ListColumnLabel string `json:"LIST_COLUMN_LABEL"` + ListFilterLabel string `json:"LIST_FILTER_LABEL"` + ErrorMessage string `json:"ERROR_MESSAGE"` + HelpMessage string `json:"HELP_MESSAGE"` } -type IntegerEntityType int - -const ( - IntegerEntityTypeLead IntegerEntityType = 1 // воронки не поддерживает - IntegerEntityTypeCompany IntegerEntityType = 4 - IntegerEntityTypeContact IntegerEntityType = 3 - IntegerEntityTypeDeal IntegerEntityType = 2 - IntegerEntityTypeInvoiceOld IntegerEntityType = 5 // может вернуть 400 - IntegerEntityTypeInvoiceNew IntegerEntityType = 31 - IntegerEntityTypeQuote IntegerEntityType = 7 // воронки не поддерживает - IntegerEntityTypeRequisite IntegerEntityType = 8 // может вернуть 400 -) - -type NameEntityType string - -const ( - NameEntityTypeLead NameEntityType = "LEAD" - NameEntityTypeCompany NameEntityType = "COMPANY" - NameEntityTypeContact NameEntityType = "CONTACT" - NameEntityTypeDeal NameEntityType = "DEAL" - NameEntityTypeInvoiceOld NameEntityType = "INVOICE" - NameEntityTypeInvoiceNew NameEntityType = "SMART_INVOICE" - NameEntityTypeQuote NameEntityType = "QUOTE" - NameEntityTypeRequisite NameEntityType = "REQUISITE" -) - type AddFields struct { FieldName string `json:"FIELD_NAME"` EditFormLabel string `json:"EDIT_FORM_LABEL"` diff --git a/internal/models/getListPipelines.go b/internal/models/getListPipelines.go index 6088da8..76ac14c 100644 --- a/internal/models/getListPipelines.go +++ b/internal/models/getListPipelines.go @@ -1,11 +1,13 @@ package models +import "penahub.gitlab.yandexcloud.net/backend/quiz/common.git/model" + type Category struct { - ID int64 `json:"id"` - Name string `json:"name"` - Sort int64 `json:"sort"` - EntityTypeId int64 `json:"entityTypeId"` - IsDefault BitrixIsDefault `json:"isDefault"` + ID int64 `json:"id"` + Name string `json:"name"` + Sort int64 `json:"sort"` + EntityTypeId model.IntegerEntityType `json:"entityTypeId"` + IsDefault model.BitrixIsDefault `json:"isDefault"` } type CategoryResponse struct { @@ -13,14 +15,3 @@ type CategoryResponse struct { Categories []Category `json:"categories"` } `json:"result"` } - -type BitrixIsDefault string - -const ( - BitrixIsDefaultY BitrixIsDefault = "Y" - BitrixIsDefaultN BitrixIsDefault = "N" -) - -var CategoryArr = [4]IntegerEntityType{ - IntegerEntityTypeCompany, IntegerEntityTypeContact, IntegerEntityTypeDeal, IntegerEntityTypeInvoiceNew, -} diff --git a/internal/models/getListSteps.go b/internal/models/getListSteps.go index fdb69dc..d079c74 100644 --- a/internal/models/getListSteps.go +++ b/internal/models/getListSteps.go @@ -1,42 +1,26 @@ package models +import "penahub.gitlab.yandexcloud.net/backend/quiz/common.git/model" + type StepsResponse struct { Result []Steps `json:"result"` } type Steps struct { - ID string `json:"ID"` - EntityID string `json:"ENTITY_ID"` - StatusID string `json:"STATUS_ID"` - Name string `json:"NAME"` - NameInit string `json:"NAME_INIT,omitempty"` - Sort string `json:"SORT"` - System string `json:"SYSTEM"` - Color string `json:"COLOR,omitempty"` - Semantics string `json:"SEMANTICS,omitempty"` - CategoryID string `json:"CATEGORY_ID"` - Extra Extra `json:"EXTRA,omitempty"` + ID string `json:"ID"` + EntityID model.TypeStepsEntityID `json:"ENTITY_ID"` + StatusID string `json:"STATUS_ID"` + Name string `json:"NAME"` + NameInit string `json:"NAME_INIT,omitempty"` + Sort string `json:"SORT"` + System string `json:"SYSTEM"` + Color string `json:"COLOR,omitempty"` + Semantics string `json:"SEMANTICS,omitempty"` + CategoryID string `json:"CATEGORY_ID"` + Extra Extra `json:"EXTRA,omitempty"` } type Extra struct { Semantics string `json:"SEMANTICS,omitempty"` Color string `json:"COLOR,omitempty"` } - -type TypeStepsEntityID string - -const ( - StatusStepsEntityID TypeStepsEntityID = "STATUS" - DealTypeStepsEntityID TypeStepsEntityID = "DEAL_TYPE" - DealStageStepsEntityID TypeStepsEntityID = "DEAL_STAGE" - SourceStepsEntityID TypeStepsEntityID = "SOURCE" - ContactTypeStepsEntityID TypeStepsEntityID = "CONTACT_TYPE" - CompanyTypeStepsEntityID TypeStepsEntityID = "COMPANY_TYPE" - EmployeesStepsEntityID TypeStepsEntityID = "EMPLOYEES" - IndustryStepsEntityID TypeStepsEntityID = "INDUSTRY" - SmartInvoiceStageStepsEntityID TypeStepsEntityID = "SMART_INVOICE_STAGE_3" - QuoteStatusStepsEntityID TypeStepsEntityID = "QUOTE_STATUS" - HonorificStepsEntityID TypeStepsEntityID = "HONORIFIC" - CallListStepsEntityID TypeStepsEntityID = "CALL_LIST" - SmartDocumentStageStepsEntityID TypeStepsEntityID = "SMART_DOCUMENT_STAGE_5" -) diff --git a/pkg/bitrixClient/bitrix.go b/pkg/bitrixClient/bitrix.go index 34f66aa..8f92037 100644 --- a/pkg/bitrixClient/bitrix.go +++ b/pkg/bitrixClient/bitrix.go @@ -7,6 +7,7 @@ import ( "go.uber.org/zap" "penahub.gitlab.yandexcloud.net/backend/quiz/bitrix/internal/models" "penahub.gitlab.yandexcloud.net/backend/quiz/bitrix/internal/workers/limiter" + "penahub.gitlab.yandexcloud.net/backend/quiz/common.git/model" "sync" "time" ) @@ -119,7 +120,7 @@ func (b *Bitrix) CreateWebHook(req models.WebHookRequest, domain string) (*model } } -func (b *Bitrix) GetListSteps(entityID models.TypeStepsEntityID, accessToken string, domain string) (*models.StepsResponse, error) { +func (b *Bitrix) GetListSteps(entityID model.TypeStepsEntityID, accessToken string, domain string) (*models.StepsResponse, error) { for { if b.rateLimiter.Check() { uri := fmt.Sprintf("https://%s/rest/crm.status.list", domain) @@ -161,7 +162,7 @@ func (b *Bitrix) GetListSteps(entityID models.TypeStepsEntityID, accessToken str } } -func (b *Bitrix) GetListPipelines(entityTypeID models.IntegerEntityType, accessToken string, domain string) (*models.CategoryResponse, error) { +func (b *Bitrix) GetListPipelines(entityTypeID model.IntegerEntityType, accessToken string, domain string) (*models.CategoryResponse, error) { for { if b.rateLimiter.Check() { uri := fmt.Sprintf("https://%s/rest/crm.category.list", domain) @@ -199,12 +200,12 @@ func (b *Bitrix) GetListPipelines(entityTypeID models.IntegerEntityType, accessT } } -func (b *Bitrix) GetListFields(fieldType models.FieldsType, accessToken string, domain string) (*models.FieldsResponse, error) { +func (b *Bitrix) GetListFields(fieldType model.FieldsType, accessToken string, domain string) (*models.FieldsResponse, error) { for { if b.rateLimiter.Check() { var listFields models.FieldsResponse switch fieldType { - case models.FieldTypeCompany: + case model.FieldTypeCompany: fullURL := fmt.Sprintf("https://%s/rest/crm.company.userfield.list", domain) agent := b.fiberClient.Post(fullURL) agent.Set("Authorization", "Bearer "+accessToken) @@ -236,7 +237,7 @@ func (b *Bitrix) GetListFields(fieldType models.FieldsType, accessToken string, return &listFields, nil - case models.FieldTypeLead: + case model.FieldTypeLead: fullURL := fmt.Sprintf("https://%s/rest/crm.lead.userfield.list", domain) agent := b.fiberClient.Post(fullURL) agent.Set("Authorization", "Bearer "+accessToken) @@ -268,7 +269,7 @@ func (b *Bitrix) GetListFields(fieldType models.FieldsType, accessToken string, return &listFields, nil - case models.FieldTypeContact: + case model.FieldTypeContact: fullURL := fmt.Sprintf("https://%s/rest/crm.contact.userfield.list", domain) agent := b.fiberClient.Post(fullURL) agent.Set("Authorization", "Bearer "+accessToken) @@ -299,7 +300,7 @@ func (b *Bitrix) GetListFields(fieldType models.FieldsType, accessToken string, } return &listFields, nil - case models.FieldTypeDeal: + case model.FieldTypeDeal: fullURL := fmt.Sprintf("https://%s/rest/crm.deal.userfield.list", domain) agent := b.fiberClient.Post(fullURL) agent.Set("Authorization", "Bearer "+accessToken) @@ -375,12 +376,12 @@ func (b *Bitrix) GetCurrentUser(accessToken string, domain string) (*models.Resp } // before neeed call req.GenFieldName() -func (b *Bitrix) AddFields(req models.AddFields, entity models.FieldsType, accessToken string, domain string) (int32, error) { +func (b *Bitrix) AddFields(req models.AddFields, entity model.FieldsType, accessToken string, domain string) (int32, error) { for { if b.rateLimiter.Check() { var result models.MultiResp switch entity { - case models.FieldTypeContact: + case model.FieldTypeContact: bodyBytes, err := json.Marshal(req) if err != nil { b.logger.Error("error marshal req in Add Fields:", zap.Error(err)) @@ -413,7 +414,7 @@ func (b *Bitrix) AddFields(req models.AddFields, entity models.FieldsType, acces } return result.ID, nil - case models.FieldTypeCompany: + case model.FieldTypeCompany: bodyBytes, err := json.Marshal(req) if err != nil { b.logger.Error("error marshal req in Add Fields:", zap.Error(err)) @@ -446,7 +447,7 @@ func (b *Bitrix) AddFields(req models.AddFields, entity models.FieldsType, acces } return result.ID, nil - case models.FieldTypeDeal: + case model.FieldTypeDeal: bodyBytes, err := json.Marshal(req) if err != nil { b.logger.Error("error marshal req in Add Fields:", zap.Error(err)) @@ -479,7 +480,7 @@ func (b *Bitrix) AddFields(req models.AddFields, entity models.FieldsType, acces } return result.ID, nil - case models.FieldTypeLead: + case model.FieldTypeLead: bodyBytes, err := json.Marshal(req) if err != nil { b.logger.Error("error marshal req in Add Fields:", zap.Error(err)) diff --git a/pkg/bitrixClient/bitrix_test.go b/pkg/bitrixClient/bitrix_test.go index 7373606..2040e84 100644 --- a/pkg/bitrixClient/bitrix_test.go +++ b/pkg/bitrixClient/bitrix_test.go @@ -7,6 +7,7 @@ import ( "go.uber.org/zap" "penahub.gitlab.yandexcloud.net/backend/quiz/bitrix/internal/models" "penahub.gitlab.yandexcloud.net/backend/quiz/bitrix/internal/workers/limiter" + "penahub.gitlab.yandexcloud.net/backend/quiz/common.git/model" "testing" "time" ) @@ -23,24 +24,23 @@ func TestGetListFields(t *testing.T) { RateLimiter: lim, }) - //arr := []models.FieldsType{models.FieldTypeLead, models.FieldTypeCompany, models.FieldTypeContact, models.FieldTypeDeal} - // - //for i, tipe := range arr { - // req := models.AddFields{ - // EditFormLabel: fmt.Sprintf("EditFormLabel %d", i), - // ListColumnLabel: fmt.Sprintf("ListColumnLabel %d", i), - // UserTypeID: "string", - // Settings: map[string]interface{}{ - // "DEFAULT_VALUE": "GOGOGOGOGOGOGO!", - // }} - // req.GenFieldName() - // result, err := b.AddFields(req, tipe, "9c7cf1660000071b00717f9200000001000007b3c27dd12d61d2e90dd1e630638b8346", "b24-ld76ub.bitrix24.ru") - // if err != nil { - // fmt.Println(err) - // } - // fmt.Println(result) - //} - // + arr := []model.FieldsType{model.FieldTypeLead, model.FieldTypeCompany, model.FieldTypeContact, model.FieldTypeDeal} + + for i, tipe := range arr { + req := models.AddFields{ + EditFormLabel: fmt.Sprintf("EditFormLabel %d", i), + ListColumnLabel: fmt.Sprintf("ListColumnLabel %d", i), + UserTypeID: "string", + Settings: map[string]interface{}{ + "DEFAULT_VALUE": "GOGOGOGOGOGOGO!", + }} + req.GenFieldName() + result, err := b.AddFields(req, tipe, "9c7cf1660000071b00717f9200000001000007b3c27dd12d61d2e90dd1e630638b8346", "b24-ld76ub.bitrix24.ru") + if err != nil { + fmt.Println(err) + } + fmt.Println(result) + } fieldAnswer := make(map[string]string) fieldAnswer["UF_CRM_1727099993"] = "field1" @@ -115,38 +115,27 @@ func TestGetListFields(t *testing.T) { fmt.Println(err) } - //for _, tipe := range models.CategoryArr { - // result, err := b.GetListPipelines(tipe, "0a53f1660000071b00717f920000000100000755c9513daaf6c8fdaed51b47397233f7", "b24-ld76ub.bitrix24.ru") - // if err != nil { - // fmt.Println(err) - // } - // - // r, _ := json.Marshal(result) - // fmt.Println(string(r)) - //} + for _, tipe := range model.CategoryArr { + result, err := b.GetListPipelines(tipe, "eb19f5660000071b00717f9200000001000007f6c1795b0c3c995cf4cbbae1a9d0394c", "b24-ld76ub.bitrix24.ru") + if err != nil { + fmt.Println(err) + } - //for _, tipe := range arr { - // result, err := b.GetListFields(tipe, "9c7cf1660000071b00717f9200000001000007b3c27dd12d61d2e90dd1e630638b8346", "b24-ld76ub.bitrix24.ru") - // if err != nil { - // fmt.Println(err) - // } - // - // r, _ := json.Marshal(result) - // fmt.Println(string(r)) - // fmt.Println(tipe) - //} + r, _ := json.Marshal(result) + fmt.Println(string(r)) + } + + for _, tipe := range arr { + result, err := b.GetListFields(tipe, "eb19f5660000071b00717f9200000001000007f6c1795b0c3c995cf4cbbae1a9d0394c", "b24-ld76ub.bitrix24.ru") + if err != nil { + fmt.Println(err) + } + + r, _ := json.Marshal(result) + fmt.Println(string(r)) + fmt.Println(tipe) + } - //result, err := b.CreateCompany(models.CompanyReq{ - // Fields: models.CompanyFields{ - // Title: "TEST COMPANY", - // AssignedByID: 1, - // Opened: "Y", - // }, - //}, "f799f1660000071b00717f9200000001000007f8cffe7b5fb03a624a82b0ecb54cfd48", "b24-ld76ub.bitrix24.ru") - //if err != nil { - // fmt.Println(err) - //} - //// r, _ := json.Marshal(result) fmt.Println(string(r))