Merge branch 'dev' of github.com:aisa-it/aiplan into dev

Author: EgorSheff

aiplan.go/internal/aiplan/dao/issue.go

@@ -44,9 +44,9 @@ type Issue struct {
 	// priority character varying(30) COLLATE pg_catalog."default",
 	Priority *string `json:"priority" extensions:"x-nullable"`
 
-	StartDate   *types.TargetDate      `json:"start_date" extensions:"x-nullable"`
+	StartDate   *types.TargetDateTimeZ `json:"start_date" extensions:"x-nullable"`
 	TargetDate  *types.TargetDateTimeZ `json:"target_date" extensions:"x-nullable"`
-	CompletedAt *types.TargetDate      `json:"completed_at" extensions:"x-nullable"`
+	CompletedAt *types.TargetDateTimeZ `json:"completed_at" extensions:"x-nullable"`
 
 	SequenceId int `json:"sequence_id" gorm:"default:1;index:,where:deleted_at is not null"`
 	// created_by_id uuid,
@@ -1633,11 +1633,11 @@ func CreateIssue(db *gorm.DB, issue *Issue) error {
 
 	// Start timer if state in started group
 	if issue.State.Group == "started" {
-		issue.StartDate = &types.TargetDate{Time: time.Now()}
+		issue.StartDate = &types.TargetDateTimeZ{Time: time.Now()}
 	}
 
 	if issue.State.Group == "completed" {
-		issue.CompletedAt = &types.TargetDate{Time: time.Now()}
+		issue.CompletedAt = &types.TargetDateTimeZ{Time: time.Now()}
 	}
 
 	issue.State = nil

aiplan.go/internal/aiplan/dto/issue.go

@@ -53,9 +53,9 @@ type Issue struct {
 
 	Priority *string `json:"priority" extensions:"x-nullable"`
 
-	StartDate   *types.TargetDate      `json:"start_date" extensions:"x-nullable"`
+	StartDate   *types.TargetDateTimeZ `json:"start_date" extensions:"x-nullable"`
 	TargetDate  *types.TargetDateTimeZ `json:"target_date" extensions:"x-nullable"`
-	CompletedAt *types.TargetDate      `json:"completed_at" extensions:"x-nullable"`
+	CompletedAt *types.TargetDateTimeZ `json:"completed_at" extensions:"x-nullable"`
 
 	ProjectId   string `json:"project"`
 	WorkspaceId string `json:"workspace"`

aiplan.go/internal/aiplan/dto/search.go

@@ -27,9 +27,9 @@ type SearchLightweightResponse struct {
 	Name     string  `json:"name"`
 	Priority *string `json:"priority" extensions:"x-nullable"`
 
-	StartDate   *types.TargetDate      `json:"start_date" extensions:"x-nullable" swaggertype:"string"`
+	StartDate   *types.TargetDateTimeZ `json:"start_date" extensions:"x-nullable" swaggertype:"string"`
 	TargetDate  *types.TargetDateTimeZ `json:"target_date" extensions:"x-nullable" swaggertype:"string"`
-	CompletedAt *types.TargetDate      `json:"completed_at" extensions:"x-nullable" swaggertype:"string"`
+	CompletedAt *types.TargetDateTimeZ `json:"completed_at" extensions:"x-nullable" swaggertype:"string"`
 
 	CreatedAt time.Time `json:"created_at"`
 	UpdatedAt time.Time `json:"updated_at"`

aiplan.go/internal/aiplan/http-short-url.go

@@ -45,10 +45,10 @@ func (s *Services) shortIssueURLRedirect(c echo.Context) error {
 	}
 
 	ref, _ := url.Parse(fmt.Sprintf(
-		"/%s/projects/%s/issues/%s/",
+		"/%s/projects/%s/issues/%d/",
 		slug,
-		issue.ProjectId,
-		issue.ID.String()))
+		issue.Project.Identifier,
+		issue.SequenceId))
 	path := cfg.WebURL.ResolveReference(ref)
 	return c.Redirect(http.StatusTemporaryRedirect, path.String())
 }

aiplan.go/internal/aiplan/http-sprint.go

@@ -2,6 +2,8 @@ package aiplan
 
 import (
 	"errors"
+	"net/http"
+
 	tracker "github.com/aisa-it/aiplan/aiplan.go/internal/aiplan/activity-tracker"
 	"github.com/aisa-it/aiplan/aiplan.go/internal/aiplan/apierrors"
 	"github.com/aisa-it/aiplan/aiplan.go/internal/aiplan/dao"
@@ -13,7 +15,6 @@ import (
 	"github.com/labstack/echo/v4"
 	"gorm.io/gorm"
 	"gorm.io/gorm/clause"
-	"net/http"
 )
 
 type SprintContext struct {
@@ -34,7 +35,8 @@ func (s *Services) SprintMiddleware(next echo.HandlerFunc) echo.HandlerFunc {
 			Joins("UpdatedBy").
 			Preload("Watchers").
 			Preload("Issues").
-			Where("sprints.workspace_id = ?", workspace.ID)
+			Where("sprints.workspace_id = ?", workspace.ID).
+			Set("issueProgress", true)
 
 		if val, err := uuid.FromString(sprintId); err != nil {
 			query = query.Where("sprints.sequence_id = ?", sprintId)