Skip to content

feat(poam): enhance milestone model — full status set, plannedCompletionDate, responsibleParty, remarks #347

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AKAbdulHanif wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat(poam): enhance milestone model — full status set, plannedCompletionDate, responsibleParty, remarks #347

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions cmd/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ func bindEnvironmentVariables() {
viper.MustBindEnv("evidence_default_expiry_months")
viper.MustBindEnv("digest_enabled")
viper.MustBindEnv("digest_schedule")
viper.MustBindEnv("worker_enabled")
}

func init() {
Expand Down
24 changes: 21 additions & 3 deletions docs/docs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26634,7 +26634,13 @@ const docTemplate = `{
"description": "OrderIndex is a pointer so that clients can explicitly set 0 without it\nbeing indistinguishable from an omitted field.",
"type": "integer"
},
"scheduledCompletionDate": {
"plannedCompletionDate": {
"type": "string"
},
"remarks": {
"type": "string"
},
"responsibleParty": {
"type": "string"
},
"status": {
Expand Down Expand Up @@ -26801,10 +26807,16 @@ const docTemplate = `{
"orderIndex": {
"type": "integer"
},
"plannedCompletionDate": {
"type": "string"
},
"poamItemId": {
"type": "string"
},
"scheduledCompletionDate": {
"remarks": {
"type": "string"
},
"responsibleParty": {
"type": "string"
},
"status": {
Expand Down Expand Up @@ -27078,7 +27090,13 @@ const docTemplate = `{
"orderIndex": {
"type": "integer"
},
"scheduledCompletionDate": {
"plannedCompletionDate": {
"type": "string"
},
"remarks": {
"type": "string"
},
"responsibleParty": {
"type": "string"
},
"status": {
Expand Down
24 changes: 21 additions & 3 deletions docs/swagger.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26628,7 +26628,13 @@
"description": "OrderIndex is a pointer so that clients can explicitly set 0 without it\nbeing indistinguishable from an omitted field.",
"type": "integer"
},
"scheduledCompletionDate": {
"plannedCompletionDate": {
"type": "string"
},
"remarks": {
"type": "string"
},
"responsibleParty": {
"type": "string"
},
"status": {
Expand Down Expand Up @@ -26795,10 +26801,16 @@
"orderIndex": {
"type": "integer"
},
"plannedCompletionDate": {
"type": "string"
},
"poamItemId": {
"type": "string"
},
"scheduledCompletionDate": {
"remarks": {
"type": "string"
},
"responsibleParty": {
"type": "string"
},
"status": {
Expand Down Expand Up @@ -27072,7 +27084,13 @@
"orderIndex": {
"type": "integer"
},
"scheduledCompletionDate": {
"plannedCompletionDate": {
"type": "string"
},
"remarks": {
"type": "string"
},
"responsibleParty": {
"type": "string"
},
"status": {
Expand Down
18 changes: 15 additions & 3 deletions docs/swagger.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1538,7 +1538,11 @@ definitions:
OrderIndex is a pointer so that clients can explicitly set 0 without it
being indistinguishable from an omitted field.
type: integer
scheduledCompletionDate:
plannedCompletionDate:
type: string
remarks:
type: string
responsibleParty:
type: string
status:
type: string
Expand Down Expand Up @@ -1650,9 +1654,13 @@ definitions:
type: string
orderIndex:
type: integer
plannedCompletionDate:
type: string
poamItemId:
type: string
scheduledCompletionDate:
remarks:
type: string
responsibleParty:
type: string
status:
type: string
Expand Down Expand Up @@ -1832,7 +1840,11 @@ definitions:
type: string
orderIndex:
type: integer
scheduledCompletionDate:
plannedCompletionDate:
type: string
remarks:
type: string
responsibleParty:
type: string
status:
type: string
Expand Down
102 changes: 58 additions & 44 deletions internal/api/handler/poam_items.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,21 +109,25 @@ type updatePoamItemRequest struct {
}

type createMilestoneRequest struct {
Title string `json:"title" validate:"required"`
Description string `json:"description"`
Status string `json:"status"`
ScheduledCompletionDate *time.Time `json:"scheduledCompletionDate"`
Title string `json:"title" validate:"required"`
Description string `json:"description"`
Status string `json:"status"`
PlannedCompletionDate *time.Time `json:"plannedCompletionDate"`
ResponsibleParty *string `json:"responsibleParty"`
Remarks *string `json:"remarks"`
// OrderIndex is a pointer so that clients can explicitly set 0 without it
// being indistinguishable from an omitted field.
OrderIndex *int `json:"orderIndex"`
}

type updateMilestoneRequest struct {
Title *string `json:"title"`
Description *string `json:"description"`
Status *string `json:"status"`
ScheduledCompletionDate *time.Time `json:"scheduledCompletionDate"`
OrderIndex *int `json:"orderIndex"`
Title *string `json:"title"`
Description *string `json:"description"`
Status *string `json:"status"`
PlannedCompletionDate *time.Time `json:"plannedCompletionDate"`
ResponsibleParty *string `json:"responsibleParty"`
Remarks *string `json:"remarks"`
OrderIndex *int `json:"orderIndex"`
}

type addLinkRequest struct {
Expand Down Expand Up @@ -185,16 +189,18 @@ type poamItemResponse struct {
}

type milestoneResponse struct {
ID uuid.UUID `json:"id"`
PoamItemID uuid.UUID `json:"poamItemId"`
Title string `json:"title"`
Description string `json:"description"`
Status string `json:"status"`
ScheduledCompletionDate *time.Time `json:"scheduledCompletionDate,omitempty"`
CompletionDate *time.Time `json:"completionDate,omitempty"`
OrderIndex int `json:"orderIndex"`
CreatedAt time.Time `json:"createdAt"`
UpdatedAt time.Time `json:"updatedAt"`
ID uuid.UUID `json:"id"`
PoamItemID uuid.UUID `json:"poamItemId"`
Title string `json:"title"`
Description string `json:"description"`
Status string `json:"status"`
PlannedCompletionDate *time.Time `json:"plannedCompletionDate,omitempty"`
CompletionDate *time.Time `json:"completionDate,omitempty"`
ResponsibleParty *string `json:"responsibleParty,omitempty"`
Remarks *string `json:"remarks,omitempty"`
OrderIndex int `json:"orderIndex"`
CreatedAt time.Time `json:"createdAt"`
UpdatedAt time.Time `json:"updatedAt"`
}

func toPoamItemResponse(item *poamsvc.PoamItem) poamItemResponse {
Expand Down Expand Up @@ -251,16 +257,18 @@ func toPoamItemResponse(item *poamsvc.PoamItem) poamItemResponse {

func toMilestoneResponse(m *poamsvc.PoamItemMilestone) milestoneResponse {
return milestoneResponse{
ID: m.ID,
PoamItemID: m.PoamItemID,
Title: m.Title,
Description: m.Description,
Status: m.Status,
ScheduledCompletionDate: m.ScheduledCompletionDate,
CompletionDate: m.CompletionDate,
OrderIndex: m.OrderIndex,
CreatedAt: m.CreatedAt,
UpdatedAt: m.UpdatedAt,
ID: m.ID,
PoamItemID: m.PoamItemID,
Title: m.Title,
Description: m.Description,
Status: m.Status,
PlannedCompletionDate: m.PlannedCompletionDate,
CompletionDate: m.CompletionDate,
ResponsibleParty: m.ResponsibleParty,
Remarks: m.Remarks,
OrderIndex: m.OrderIndex,
CreatedAt: m.CreatedAt,
UpdatedAt: m.UpdatedAt,
}
}

Expand Down Expand Up @@ -416,11 +424,13 @@ func (h *PoamItemsHandler) Create(c echo.Context) error {
msOrderIdx = *mr.OrderIndex
}
params.Milestones = append(params.Milestones, poamsvc.CreateMilestoneParams{
Title: mr.Title,
Description: mr.Description,
Status: mr.Status,
ScheduledCompletionDate: mr.ScheduledCompletionDate,
OrderIndex: msOrderIdx,
Title: mr.Title,
Description: mr.Description,
Status: mr.Status,
PlannedCompletionDate: mr.PlannedCompletionDate,
ResponsibleParty: mr.ResponsibleParty,
Remarks: mr.Remarks,
OrderIndex: msOrderIdx,
})
}

Expand Down Expand Up @@ -663,11 +673,13 @@ func (h *PoamItemsHandler) AddMilestone(c echo.Context) error {
orderIdx = *in.OrderIndex
}
m, err := h.poamService.AddMilestone(id, poamsvc.CreateMilestoneParams{
Title: in.Title,
Description: in.Description,
Status: in.Status,
ScheduledCompletionDate: in.ScheduledCompletionDate,
OrderIndex: orderIdx,
Title: in.Title,
Description: in.Description,
Status: in.Status,
PlannedCompletionDate: in.PlannedCompletionDate,
ResponsibleParty: in.ResponsibleParty,
Remarks: in.Remarks,
OrderIndex: orderIdx,
})
if err != nil {
return h.internalError(c, "failed to add milestone", err)
Expand Down Expand Up @@ -707,11 +719,13 @@ func (h *PoamItemsHandler) UpdateMilestone(c echo.Context) error {
return c.JSON(http.StatusBadRequest, api.NewError(fmt.Errorf("invalid milestone status: %s", *in.Status)))
}
m, err := h.poamService.UpdateMilestone(id, milestoneID, poamsvc.UpdateMilestoneParams{
Title: in.Title,
Description: in.Description,
Status: in.Status,
ScheduledCompletionDate: in.ScheduledCompletionDate,
OrderIndex: in.OrderIndex,
Title: in.Title,
Description: in.Description,
Status: in.Status,
PlannedCompletionDate: in.PlannedCompletionDate,
ResponsibleParty: in.ResponsibleParty,
Remarks: in.Remarks,
OrderIndex: in.OrderIndex,
})
if err != nil {
if errors.Is(err, gorm.ErrRecordNotFound) {
Expand Down
Loading
Loading