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

added filter with pipelineID in GetBitrixStepsWithPagination

Browse Source
This commit is contained in:
Pasha 2025-11-29 14:46:45 +03:00
parent 4d4578de7b
commit 29dba9ce70
3 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dal/db_query/queries.sql
View File

@ -1287,7 +1287,7 @@ WITH user_data AS (
) )
SELECT s.*, COUNT(*) OVER() as total_count SELECT s.*, COUNT(*) OVER() as total_count
FROM StepBitrix s JOIN user_data u ON s.AccountID = u.BitrixID FROM StepBitrix s JOIN user_data u ON s.AccountID = u.BitrixID
WHERE s.Deleted = false ORDER BY s.ID OFFSET ($2 - 1) * $3 LIMIT $3; WHERE s.Deleted = false AND s.PipelineID = $4 ORDER BY s.ID OFFSET ($2 - 1) * $3 LIMIT $3;
-- name: DeleteBitrixSteps :exec -- name: DeleteBitrixSteps :exec
UPDATE StepBitrix SET Deleted = true WHERE ID = ANY($1::bigint[]); UPDATE StepBitrix SET Deleted = true WHERE ID = ANY($1::bigint[]);

16
dal/sqlcgen/queries.sql.go
View File

@ -2571,13 +2571,14 @@ WITH user_data AS (
) )
SELECT s.id, s.accountid, s.bitrixid, s.entityid, s.statusid, s.name, s.nameinit, s.color, s.pipelineid, s.deleted, s.createdat, COUNT(*) OVER() as total_count SELECT s.id, s.accountid, s.bitrixid, s.entityid, s.statusid, s.name, s.nameinit, s.color, s.pipelineid, s.deleted, s.createdat, COUNT(*) OVER() as total_count
FROM StepBitrix s JOIN user_data u ON s.AccountID = u.BitrixID FROM StepBitrix s JOIN user_data u ON s.AccountID = u.BitrixID
WHERE s.Deleted = false ORDER BY s.ID OFFSET ($2 - 1) * $3 LIMIT $3 WHERE s.Deleted = false AND s.PipelineID = $4 ORDER BY s.ID OFFSET ($2 - 1) * $3 LIMIT $3
` `
type GetBitrixStepsWithPaginationParams struct { type GetBitrixStepsWithPaginationParams struct {
Accountid string `db:"accountid" json:"accountid"` Accountid string `db:"accountid" json:"accountid"`
Column2 interface{} `db:"column_2" json:"column_2"` Column2 interface{} `db:"column_2" json:"column_2"`
Limit int32 `db:"limit" json:"limit"` Limit int32 `db:"limit" json:"limit"`
Pipelineid int32 `db:"pipelineid" json:"pipelineid"`
} }
type GetBitrixStepsWithPaginationRow struct { type GetBitrixStepsWithPaginationRow struct {
@ -2596,7 +2597,12 @@ type GetBitrixStepsWithPaginationRow struct {
} }
func (q *Queries) GetBitrixStepsWithPagination(ctx context.Context, arg GetBitrixStepsWithPaginationParams) ([]GetBitrixStepsWithPaginationRow, error) { func (q *Queries) GetBitrixStepsWithPagination(ctx context.Context, arg GetBitrixStepsWithPaginationParams) ([]GetBitrixStepsWithPaginationRow, error) {
rows, err := q.db.QueryContext(ctx, getBitrixStepsWithPagination, arg.Accountid, arg.Column2, arg.Limit) rows, err := q.db.QueryContext(ctx, getBitrixStepsWithPagination,
arg.Accountid,
arg.Column2,
arg.Limit,
arg.Pipelineid,
)
if err != nil { if err != nil {
return nil, err return nil, err
} }

10
repository/bitrix/bitrix.go
View File

@ -4,6 +4,7 @@ import (
"context" "context"
"database/sql" "database/sql"
"encoding/json" "encoding/json"
"gitea.pena/SQuiz/common/dal/sqlcgen" "gitea.pena/SQuiz/common/dal/sqlcgen"
"gitea.pena/SQuiz/common/model" "gitea.pena/SQuiz/common/model"
"gitea.pena/SQuiz/common/pj_errors" "gitea.pena/SQuiz/common/pj_errors"
@ -363,11 +364,12 @@ func (r *BitrixRepository) GetUserPipelinesByID(ctx context.Context, bitrixID st
} }
// методы steps // методы steps
func (r *BitrixRepository) GetStepsWithPagination(ctx context.Context, req *model.PaginationReq, bitrixID string) (*model.UserListBitrixStepsResp, error) { func (r *BitrixRepository) GetStepsWithPagination(ctx context.Context, req *model.PaginationReq, bitrixID string, pipelineID int32) (*model.UserListBitrixStepsResp, error) {
rows, err := r.queries.GetBitrixStepsWithPagination(ctx, sqlcgen.GetBitrixStepsWithPaginationParams{ rows, err := r.queries.GetBitrixStepsWithPagination(ctx, sqlcgen.GetBitrixStepsWithPaginationParams{
Accountid: bitrixID, Accountid: bitrixID,
Column2: req.Page, Column2: req.Page,
Limit: req.Size, Limit: req.Size,
Pipelineid: pipelineID,
}) })
if err != nil { if err != nil {
return nil, err return nil, err