From eb05bf847010e84b16ec45ca79d6a1d79c0032fb Mon Sep 17 00:00:00 2001 From: naudachu Date: Fri, 24 Nov 2023 15:18:30 +0500 Subject: [PATCH] project name at the DB and everywhere --- internal/controller/control_folder.go | 1 + internal/controller/control_git.go | 1 + internal/storage/db/models.go | 1 + internal/storage/db/queries.sql.go | 31 ++++++++++++------- .../migrate/0002_projectName_to_tickets.sql | 7 +++++ internal/storage/sqlc/queries.sql | 4 +-- 6 files changed, 32 insertions(+), 13 deletions(-) create mode 100644 internal/storage/migrate/0002_projectName_to_tickets.sql diff --git a/internal/controller/control_folder.go b/internal/controller/control_folder.go index e138c0c..9ca52e1 100644 --- a/internal/controller/control_folder.go +++ b/internal/controller/control_folder.go @@ -65,6 +65,7 @@ func (wc *WorkflowController) CreateFolder(ctx context.Context, req FolderReques result = ProjectResponse{ Project: &domain.Project{ ID: string(dbticket.ID), + Name: dbticket.Title.String, Key: dbticket.Key.String, ChannelID: dbticket.Channelid.String, ProjectGit: dbticket.ProjectGit.String, diff --git a/internal/controller/control_git.go b/internal/controller/control_git.go index 928006e..6d27967 100644 --- a/internal/controller/control_git.go +++ b/internal/controller/control_git.go @@ -81,6 +81,7 @@ func (wc *WorkflowController) createGitForExistingProject(ctx context.Context, r return &ProjectResponse{ Project: &domain.Project{ ID: string(dbticket.ID), + Name: dbticket.Title.String, Key: dbticket.Key.String, ChannelID: dbticket.Channelid.String, ProjectGit: dbticket.ProjectGit.String, diff --git a/internal/storage/db/models.go b/internal/storage/db/models.go index 6af8f66..0e46b8e 100644 --- a/internal/storage/db/models.go +++ b/internal/storage/db/models.go @@ -35,4 +35,5 @@ type Ticket struct { CreatedAt pgtype.Timestamptz DeletedAt pgtype.Timestamptz UpdatedAt pgtype.Timestamptz + Title pgtype.Text } diff --git a/internal/storage/db/queries.sql.go b/internal/storage/db/queries.sql.go index 13685a7..fbad40c 100644 --- a/internal/storage/db/queries.sql.go +++ b/internal/storage/db/queries.sql.go @@ -43,20 +43,21 @@ func (q *Queries) CloseTask(ctx context.Context, arg CloseTaskParams) (Task, err const createTicket = `-- name: CreateTicket :one INSERT INTO tickets ( - key, channelID + key, channelID, title ) 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 { Key pgtype.Text Channelid pgtype.Text + Title pgtype.Text } 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 err := row.Scan( &i.ID, @@ -68,6 +69,7 @@ func (q *Queries) CreateTicket(ctx context.Context, arg CreateTicketParams) (Tic &i.CreatedAt, &i.DeletedAt, &i.UpdatedAt, + &i.Title, ) return i, err } @@ -145,7 +147,7 @@ func (q *Queries) GetTaskByMessage(ctx context.Context, messageid pgtype.Text) ( } 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) { @@ -161,12 +163,13 @@ func (q *Queries) GetTicketByChannelID(ctx context.Context, channelid pgtype.Tex &i.CreatedAt, &i.DeletedAt, &i.UpdatedAt, + &i.Title, ) return i, err } 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) { @@ -182,6 +185,7 @@ func (q *Queries) GetTicketByID(ctx context.Context, id int32) (Ticket, error) { &i.CreatedAt, &i.DeletedAt, &i.UpdatedAt, + &i.Title, ) return i, err } @@ -253,7 +257,7 @@ func (q *Queries) ListTasksByCreator(ctx context.Context, creatorLink pgtype.Tex } 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) { @@ -275,6 +279,7 @@ func (q *Queries) ListTickets(ctx context.Context) ([]Ticket, error) { &i.CreatedAt, &i.DeletedAt, &i.UpdatedAt, + &i.Title, ); err != nil { return nil, err } @@ -287,7 +292,7 @@ func (q *Queries) ListTickets(ctx context.Context) ([]Ticket, error) { } 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) { @@ -309,6 +314,7 @@ func (q *Queries) ListTicketsWithDeleted(ctx context.Context) ([]Ticket, error) &i.CreatedAt, &i.DeletedAt, &i.UpdatedAt, + &i.Title, ); err != nil { return nil, err } @@ -383,7 +389,7 @@ const updateTicketBuildGit = `-- name: UpdateTicketBuildGit :one UPDATE tickets SET build_git = $1, updated_at = $2 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 { @@ -405,6 +411,7 @@ func (q *Queries) UpdateTicketBuildGit(ctx context.Context, arg UpdateTicketBuil &i.CreatedAt, &i.DeletedAt, &i.UpdatedAt, + &i.Title, ) return i, err } @@ -434,7 +441,7 @@ const updateTicketFolder = `-- name: UpdateTicketFolder :one UPDATE tickets SET folder = $1, updated_at = $2 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 { @@ -456,6 +463,7 @@ func (q *Queries) UpdateTicketFolder(ctx context.Context, arg UpdateTicketFolder &i.CreatedAt, &i.DeletedAt, &i.UpdatedAt, + &i.Title, ) return i, err } @@ -464,7 +472,7 @@ const updateTicketProjectGit = `-- name: UpdateTicketProjectGit :one UPDATE tickets SET project_git = $1, updated_at = $2 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 { @@ -486,6 +494,7 @@ func (q *Queries) UpdateTicketProjectGit(ctx context.Context, arg UpdateTicketPr &i.CreatedAt, &i.DeletedAt, &i.UpdatedAt, + &i.Title, ) return i, err } diff --git a/internal/storage/migrate/0002_projectName_to_tickets.sql b/internal/storage/migrate/0002_projectName_to_tickets.sql new file mode 100644 index 0000000..9d88f53 --- /dev/null +++ b/internal/storage/migrate/0002_projectName_to_tickets.sql @@ -0,0 +1,7 @@ +-- +migrate Up +ALTER TABLE tickets +ADD COLUMN title VARCHAR(100); + +-- +migrate Down +ALTER TABLE tickets +DROP COLUMN title; \ No newline at end of file diff --git a/internal/storage/sqlc/queries.sql b/internal/storage/sqlc/queries.sql index cae5e62..a721d02 100644 --- a/internal/storage/sqlc/queries.sql +++ b/internal/storage/sqlc/queries.sql @@ -9,9 +9,9 @@ RETURNING *; -- name: CreateTicket :one INSERT INTO tickets ( - key, channelID + key, channelID, title ) VALUES ( - $1, $2 + $1, $2, $3 ) RETURNING *;