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

update amo queries

Browse Source
This commit is contained in:
Pavel 2024-06-12 16:36:36 +03:00
parent 92b755fde5
commit 2fe0379a67
3 changed files with 16 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dal/schema/000014_init.up.sql
View File

@ -10,7 +10,7 @@ CREATE TABLE IF NOT EXISTS accountsAmo (
CreatedAt TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, CreatedAt TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
Subdomain VARCHAR(50) NOT NULL DEFAULT '', -- поддомен - пример https://penadigitaltech.amocrm.ru Subdomain VARCHAR(50) NOT NULL DEFAULT '', -- поддомен - пример https://penadigitaltech.amocrm.ru
Country VARCHAR(50) NOT NULL DEFAULT '', Country VARCHAR(50) NOT NULL DEFAULT '',
DriveURL VARCHAR(255) DEFAULT '' -- URL объктного хранилища DriveURL VARCHAR(255) NOT NULL DEFAULT '' -- URL объктного хранилища
); );
CREATE UNIQUE INDEX idx_unique_accountsAmo ON accountsAmo (amoID) WHERE Deleted = false; CREATE UNIQUE INDEX idx_unique_accountsAmo ON accountsAmo (amoID) WHERE Deleted = false;

2
model/amoResp.go
View File

@ -55,7 +55,7 @@ type UserListResp struct {
/* - общее количество юзеров, которые у нас закешированы для этого пользователя*/ /* - общее количество юзеров, которые у нас закешированы для этого пользователя*/
Count int64 `json:"count"` Count int64 `json:"count"`
/* - список юзеров, которые были закешированы нашим сервисом*/ /* - список юзеров, которые были закешированы нашим сервисом*/
Items []User `json:"items"` Items []AmoAccountUser `json:"items"`
} }
type UserListStepsResp struct { type UserListStepsResp struct {

38
repository/amo/amo.go
View File

@ -39,20 +39,18 @@ func (r *AmoRepository) GettingUserWithPagination(ctx context.Context, req *mode
return nil, err return nil, err
} }
var count int64 var count int64
var users []model.User var users []model.AmoAccountUser
for _, row := range rows { for _, row := range rows {
user := model.User{ user := model.AmoAccountUser{
ID: row.ID, ID: row.ID,
Accountid: row.Accountid,
AmoID: row.Amoid, AmoID: row.Amoid,
AmoUserID: row.Amouserid,
Name: row.Name, Name: row.Name,
Email: row.Email, Email: row.Email,
Group: row.Group, Group: row.Group,
Role: row.Role, Role: row.Role,
Createdat: row.Createdat.Time.Unix(), Deleted: row.Deleted,
Subdomain: row.Subdomain, CreatedAt: row.Createdat,
Amouserid: row.Amouserid,
Country: row.Country,
} }
count = row.TotalCount count = row.TotalCount
@ -75,43 +73,35 @@ func (r *AmoRepository) SoftDeleteAccount(ctx context.Context, accountID string)
return nil return nil
} }
func (r *AmoRepository) GetCurrentAccount(ctx context.Context, accountID string) (*model.User, error) { func (r *AmoRepository) GetCurrentAccount(ctx context.Context, accountID string) (*model.AmoAccount, error) {
row, err := r.queries.GetCurrentAccount(ctx, accountID) row, err := r.queries.GetCurrentCompany(ctx, accountID)
if err != nil { if err != nil {
return nil, err return nil, err
} }
user := model.User{ user := model.AmoAccount{
ID: row.ID, ID: row.ID,
Accountid: row.Accountid, AccountID: row.Accountid,
AmoID: row.Amoid, AmoID: row.Amoid,
Name: row.Name, Name: row.Name,
Email: row.Email, Deleted: row.Deleted,
Role: row.Role, CreatedAt: row.Createdat,
Group: row.Group,
Createdat: row.Createdat.Time.Unix(),
Subdomain: row.Subdomain, Subdomain: row.Subdomain,
Amouserid: row.Amouserid,
Country: row.Country, Country: row.Country,
DriveURL: row.Driveurl, DriveURL: row.Driveurl.String,
} }
return &user, nil return &user, nil
} }
func (r *AmoRepository) CreateAccount(ctx context.Context, accountID string, userInfo model.User) error { func (r *AmoRepository) CreateAccount(ctx context.Context, accountID string, userInfo model.AmoAccount) error {
err := r.queries.CreateAmoAccount(ctx, sqlcgen.CreateAmoAccountParams{ err := r.queries.CreateAmoAccount(ctx, sqlcgen.CreateAmoAccountParams{
Accountid: accountID, Accountid: accountID,
Amoid: userInfo.AmoID, Amoid: userInfo.AmoID,
Name: userInfo.Name, Name: userInfo.Name,
Email: userInfo.Email,
Role: userInfo.Role,
Group: userInfo.Group,
Createdat: sql.NullTime{Time: time.Now(), Valid: true},
Subdomain: userInfo.Subdomain, Subdomain: userInfo.Subdomain,
Amouserid: userInfo.Amouserid,
Country: userInfo.Country, Country: userInfo.Country,
Driveurl: userInfo.DriveURL, Driveurl: sql.NullString{String: userInfo.DriveURL, Valid: true},
}) })
if err != nil { if err != nil {