add project tags.

database/postgres/project.go

@@ -7,6 +7,8 @@ import (
 	"github.com/gissleh/stufflog/internal/slerrors"
 	"github.com/gissleh/stufflog/models"
 	"github.com/jmoiron/sqlx"
+	"github.com/lib/pq"
+	"time"
 )
 
 type projectRepository struct {
@@ -14,17 +16,17 @@ type projectRepository struct {
 }
 
 func (r *projectRepository) Find(ctx context.Context, id string) (*models.Project, error) {
-	res := models.Project{}
+	res := projectDBO{}
 	err := r.db.GetContext(ctx, &res, "SELECT * FROM project WHERE project_id=$1", id)
 	if err != nil {
 		if err == sql.ErrNoRows {
-			return nil, slerrors.NotFound("Log")
+			return nil, slerrors.NotFound("Project")
 		}
 
 		return nil, err
 	}
 
-	return &res, nil
+	return res.ToProject(), nil
 }
 
 func (r *projectRepository) List(ctx context.Context, filter models.ProjectFilter) ([]*models.Project, error) {
@@ -60,26 +62,35 @@ func (r *projectRepository) List(ctx context.Context, filter models.ProjectFilte
 		return nil, err
 	}
 
-	res := make([]*models.Project, 0, 8)
+	res := make([]*projectDBO, 0, 8)
 	err = r.db.SelectContext(ctx, &res, query, args...)
 	if err != nil {
 		if err == sql.ErrNoRows {
-			return res, nil
+			return []*models.Project{}, nil
 		}
 		return nil, err
 	}
 
-	return res, nil
+	res2 := make([]*models.Project, len(res))
+	for i, v := range res {
+		res2[i] = v.ToProject()
+	}
+
+	return res2, nil
 }
 
 func (r *projectRepository) Insert(ctx context.Context, project models.Project) error {
+	if project.Tags == nil {
+		project.Tags = []string{}
+	}
+
 	_, err := r.db.NamedExecContext(ctx, `
 		INSERT INTO project(
-			project_id, user_id, name, description, icon, active, created_time, start_time, end_time, subtract_amount, status_tag, favorite
+			project_id, user_id, name, description, icon, active, created_time, start_time, end_time, subtract_amount, status_tag, favorite, tags
 		) VALUES (
-			:project_id, :user_id, :name, :description, :icon, :active, :created_time, :start_time, :end_time, :subtract_amount, :status_tag, :favorite
+			:project_id, :user_id, :name, :description, :icon, :active, :created_time, :start_time, :end_time, :subtract_amount, :status_tag, :favorite, :tags
 		)
-	`, &project)
+	`, toProjectDBO(project))
 	if err != nil {
 		return err
 	}
@@ -88,6 +99,10 @@ func (r *projectRepository) Insert(ctx context.Context, project models.Project)
 }
 
 func (r *projectRepository) Update(ctx context.Context, project models.Project) error {
+	if project.Tags == nil {
+		project.Tags = []string{}
+	}
+
 	_, err := r.db.NamedExecContext(ctx, `
 		UPDATE project SET
 			name = :name,
@@ -98,9 +113,10 @@ func (r *projectRepository) Update(ctx context.Context, project models.Project)
 			end_time = :end_time,
 			subtract_amount = :subtract_amount,
 		    status_tag = :status_tag,
-		    favorite = :favorite
+		    favorite = :favorite,
+			tags = :tags
 		WHERE project_id=:project_id
-	`, &project)
+	`, toProjectDBO(project))
 	if err != nil {
 		return err
 	}
@@ -124,3 +140,55 @@ func (r *projectRepository) Delete(ctx context.Context, project models.Project)
 
 	return nil
 }
+
+type projectDBO struct {
+	ID             string         `json:"id" db:"project_id"`
+	UserID         string         `json:"-" db:"user_id"`
+	Name           string         `json:"name" db:"name"`
+	Description    string         `json:"description" db:"description"`
+	Icon           string         `json:"icon" db:"icon"`
+	Active         bool           `json:"active" db:"active"`
+	CreatedTime    time.Time      `json:"createdTime" db:"created_time"`
+	StartTime      *time.Time     `json:"startTime" db:"start_time"`
+	EndTime        *time.Time     `json:"endTime" db:"end_time"`
+	SubtractAmount int            `json:"subtractAmount" db:"subtract_amount"`
+	StatusTag      *string        `json:"statusTag" db:"status_tag"`
+	Favorite       bool           `json:"favorite" db:"favorite"`
+	Tags           pq.StringArray `json:"tags" db:"tags"`
+}
+
+func toProjectDBO(project models.Project) *projectDBO {
+	return &projectDBO{
+		ID:             project.ID,
+		UserID:         project.UserID,
+		Name:           project.Name,
+		Description:    project.Description,
+		Icon:           project.Icon,
+		Active:         project.Active,
+		CreatedTime:    project.CreatedTime,
+		StartTime:      project.StartTime,
+		EndTime:        project.EndTime,
+		SubtractAmount: project.SubtractAmount,
+		StatusTag:      project.StatusTag,
+		Favorite:       project.Favorite,
+		Tags:           project.Tags,
+	}
+}
+
+func (d *projectDBO) ToProject() *models.Project {
+	return &models.Project{
+		ID:             d.ID,
+		UserID:         d.UserID,
+		Name:           d.Name,
+		Description:    d.Description,
+		Icon:           d.Icon,
+		Active:         d.Active,
+		CreatedTime:    d.CreatedTime,
+		StartTime:      d.StartTime,
+		EndTime:        d.EndTime,
+		SubtractAmount: d.SubtractAmount,
+		StatusTag:      d.StatusTag,
+		Favorite:       d.Favorite,
+		Tags:           d.Tags,
+	}
+}