naudachu
/
ticket-pimp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

project name at the DB and everywhere

This commit is contained in:
naudachu 2023-11-24 15:18:30 +05:00
parent afbf89b013
commit eb05bf8470
6 changed files with 32 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
internal/controller/control_folder.go
View File

@ -65,6 +65,7 @@ func (wc *WorkflowController) CreateFolder(ctx context.Context, req FolderReques
result = ProjectResponse{ result = ProjectResponse{
Project: &domain.Project{ Project: &domain.Project{
ID: string(dbticket.ID), ID: string(dbticket.ID),
Name: dbticket.Title.String,
Key: dbticket.Key.String, Key: dbticket.Key.String,
ChannelID: dbticket.Channelid.String, ChannelID: dbticket.Channelid.String,
ProjectGit: dbticket.ProjectGit.String, ProjectGit: dbticket.ProjectGit.String,

1
internal/controller/control_git.go
View File

@ -81,6 +81,7 @@ func (wc *WorkflowController) createGitForExistingProject(ctx context.Context, r
return &ProjectResponse{ return &ProjectResponse{
Project: &domain.Project{ Project: &domain.Project{
ID: string(dbticket.ID), ID: string(dbticket.ID),
Name: dbticket.Title.String,
Key: dbticket.Key.String, Key: dbticket.Key.String,
ChannelID: dbticket.Channelid.String, ChannelID: dbticket.Channelid.String,
ProjectGit: dbticket.ProjectGit.String, ProjectGit: dbticket.ProjectGit.String,

1
internal/storage/db/models.go
View File

@ -35,4 +35,5 @@ type Ticket struct {
CreatedAt pgtype.Timestamptz CreatedAt pgtype.Timestamptz
DeletedAt pgtype.Timestamptz DeletedAt pgtype.Timestamptz
UpdatedAt pgtype.Timestamptz UpdatedAt pgtype.Timestamptz
Title pgtype.Text
} }

31
internal/storage/db/queries.sql.go
View File

@ -43,20 +43,21 @@ func (q *Queries) CloseTask(ctx context.Context, arg CloseTaskParams) (Task, err
const createTicket = `-- name: CreateTicket :one const createTicket = `-- name: CreateTicket :one
INSERT INTO tickets ( INSERT INTO tickets (
key, channelID key, channelID, title
) VALUES ( ) VALUES (
$1, $2 $1, $2, $3
) )
RETURNING id, key, channelid, project_git, build_git, folder, created_at, deleted_at, updated_at RETURNING id, key, channelid, project_git, build_git, folder, created_at, deleted_at, updated_at, title
` `
type CreateTicketParams struct { type CreateTicketParams struct {
Key pgtype.Text Key pgtype.Text
Channelid pgtype.Text Channelid pgtype.Text
Title pgtype.Text
} }
func (q *Queries) CreateTicket(ctx context.Context, arg CreateTicketParams) (Ticket, error) { func (q *Queries) CreateTicket(ctx context.Context, arg CreateTicketParams) (Ticket, error) {
row := q.db.QueryRow(ctx, createTicket, arg.Key, arg.Channelid) row := q.db.QueryRow(ctx, createTicket, arg.Key, arg.Channelid, arg.Title)
var i Ticket var i Ticket
err := row.Scan( err := row.Scan(
&i.ID, &i.ID,
@ -68,6 +69,7 @@ func (q *Queries) CreateTicket(ctx context.Context, arg CreateTicketParams) (Tic
&i.CreatedAt, &i.CreatedAt,
&i.DeletedAt, &i.DeletedAt,
&i.UpdatedAt, &i.UpdatedAt,
&i.Title,
) )
return i, err return i, err
} }
@ -145,7 +147,7 @@ func (q *Queries) GetTaskByMessage(ctx context.Context, messageid pgtype.Text) (
} }
const getTicketByChannelID = `-- name: GetTicketByChannelID :one const getTicketByChannelID = `-- name: GetTicketByChannelID :one
SELECT id, key, channelid, project_git, build_git, folder, created_at, deleted_at, updated_at FROM tickets WHERE channelID = $1 SELECT id, key, channelid, project_git, build_git, folder, created_at, deleted_at, updated_at, title FROM tickets WHERE channelID = $1
` `
func (q *Queries) GetTicketByChannelID(ctx context.Context, channelid pgtype.Text) (Ticket, error) { func (q *Queries) GetTicketByChannelID(ctx context.Context, channelid pgtype.Text) (Ticket, error) {
@ -161,12 +163,13 @@ func (q *Queries) GetTicketByChannelID(ctx context.Context, channelid pgtype.Tex
&i.CreatedAt, &i.CreatedAt,
&i.DeletedAt, &i.DeletedAt,
&i.UpdatedAt, &i.UpdatedAt,
&i.Title,
) )
return i, err return i, err
} }
const getTicketByID = `-- name: GetTicketByID :one const getTicketByID = `-- name: GetTicketByID :one
SELECT id, key, channelid, project_git, build_git, folder, created_at, deleted_at, updated_at FROM tickets WHERE id = $1 SELECT id, key, channelid, project_git, build_git, folder, created_at, deleted_at, updated_at, title FROM tickets WHERE id = $1
` `
func (q *Queries) GetTicketByID(ctx context.Context, id int32) (Ticket, error) { func (q *Queries) GetTicketByID(ctx context.Context, id int32) (Ticket, error) {
@ -182,6 +185,7 @@ func (q *Queries) GetTicketByID(ctx context.Context, id int32) (Ticket, error) {
&i.CreatedAt, &i.CreatedAt,
&i.DeletedAt, &i.DeletedAt,
&i.UpdatedAt, &i.UpdatedAt,
&i.Title,
) )
return i, err return i, err
} }
@ -253,7 +257,7 @@ func (q *Queries) ListTasksByCreator(ctx context.Context, creatorLink pgtype.Tex
} }
const listTickets = `-- name: ListTickets :many const listTickets = `-- name: ListTickets :many
SELECT id, key, channelid, project_git, build_git, folder, created_at, deleted_at, updated_at FROM tickets WHERE deleted_at IS NULL SELECT id, key, channelid, project_git, build_git, folder, created_at, deleted_at, updated_at, title FROM tickets WHERE deleted_at IS NULL
` `
func (q *Queries) ListTickets(ctx context.Context) ([]Ticket, error) { func (q *Queries) ListTickets(ctx context.Context) ([]Ticket, error) {
@ -275,6 +279,7 @@ func (q *Queries) ListTickets(ctx context.Context) ([]Ticket, error) {
&i.CreatedAt, &i.CreatedAt,
&i.DeletedAt, &i.DeletedAt,
&i.UpdatedAt, &i.UpdatedAt,
&i.Title,
); err != nil { ); err != nil {
return nil, err return nil, err
} }
@ -287,7 +292,7 @@ func (q *Queries) ListTickets(ctx context.Context) ([]Ticket, error) {
} }
const listTicketsWithDeleted = `-- name: ListTicketsWithDeleted :many const listTicketsWithDeleted = `-- name: ListTicketsWithDeleted :many
SELECT id, key, channelid, project_git, build_git, folder, created_at, deleted_at, updated_at FROM tickets SELECT id, key, channelid, project_git, build_git, folder, created_at, deleted_at, updated_at, title FROM tickets
` `
func (q *Queries) ListTicketsWithDeleted(ctx context.Context) ([]Ticket, error) { func (q *Queries) ListTicketsWithDeleted(ctx context.Context) ([]Ticket, error) {
@ -309,6 +314,7 @@ func (q *Queries) ListTicketsWithDeleted(ctx context.Context) ([]Ticket, error)
&i.CreatedAt, &i.CreatedAt,
&i.DeletedAt, &i.DeletedAt,
&i.UpdatedAt, &i.UpdatedAt,
&i.Title,
); err != nil { ); err != nil {
return nil, err return nil, err
} }
@ -383,7 +389,7 @@ const updateTicketBuildGit = `-- name: UpdateTicketBuildGit :one
UPDATE tickets UPDATE tickets
SET build_git = $1, updated_at = $2 SET build_git = $1, updated_at = $2
WHERE channelID = $3 WHERE channelID = $3
RETURNING id, key, channelid, project_git, build_git, folder, created_at, deleted_at, updated_at RETURNING id, key, channelid, project_git, build_git, folder, created_at, deleted_at, updated_at, title
` `
type UpdateTicketBuildGitParams struct { type UpdateTicketBuildGitParams struct {
@ -405,6 +411,7 @@ func (q *Queries) UpdateTicketBuildGit(ctx context.Context, arg UpdateTicketBuil
&i.CreatedAt, &i.CreatedAt,
&i.DeletedAt, &i.DeletedAt,
&i.UpdatedAt, &i.UpdatedAt,
&i.Title,
) )
return i, err return i, err
} }
@ -434,7 +441,7 @@ const updateTicketFolder = `-- name: UpdateTicketFolder :one
UPDATE tickets UPDATE tickets
SET folder = $1, updated_at = $2 SET folder = $1, updated_at = $2
WHERE channelID = $3 WHERE channelID = $3
RETURNING id, key, channelid, project_git, build_git, folder, created_at, deleted_at, updated_at RETURNING id, key, channelid, project_git, build_git, folder, created_at, deleted_at, updated_at, title
` `
type UpdateTicketFolderParams struct { type UpdateTicketFolderParams struct {
@ -456,6 +463,7 @@ func (q *Queries) UpdateTicketFolder(ctx context.Context, arg UpdateTicketFolder
&i.CreatedAt, &i.CreatedAt,
&i.DeletedAt, &i.DeletedAt,
&i.UpdatedAt, &i.UpdatedAt,
&i.Title,
) )
return i, err return i, err
} }
@ -464,7 +472,7 @@ const updateTicketProjectGit = `-- name: UpdateTicketProjectGit :one
UPDATE tickets UPDATE tickets
SET project_git = $1, updated_at = $2 SET project_git = $1, updated_at = $2
WHERE channelID = $3 WHERE channelID = $3
RETURNING id, key, channelid, project_git, build_git, folder, created_at, deleted_at, updated_at RETURNING id, key, channelid, project_git, build_git, folder, created_at, deleted_at, updated_at, title
` `
type UpdateTicketProjectGitParams struct { type UpdateTicketProjectGitParams struct {
@ -486,6 +494,7 @@ func (q *Queries) UpdateTicketProjectGit(ctx context.Context, arg UpdateTicketPr
&i.CreatedAt, &i.CreatedAt,
&i.DeletedAt, &i.DeletedAt,
&i.UpdatedAt, &i.UpdatedAt,
&i.Title,
) )
return i, err return i, err
} }

7
internal/storage/migrate/0002_projectName_to_tickets.sql Normal file
View File

@ -0,0 +1,7 @@
-- +migrate Up
ALTER TABLE tickets
ADD COLUMN title VARCHAR(100);
-- +migrate Down
ALTER TABLE tickets
DROP COLUMN title;

4
internal/storage/sqlc/queries.sql
View File

@ -9,9 +9,9 @@ RETURNING *;
-- name: CreateTicket :one -- name: CreateTicket :one
INSERT INTO tickets ( INSERT INTO tickets (
key, channelID key, channelID, title
) VALUES ( ) VALUES (
$1, $2 $1, $2, $3
) )
RETURNING *; RETURNING *;