Add serialization step on GetTasks

api/internal/dto/dto.go

@@ -0,0 +1,35 @@
+package dto
+
+import (
+	"time"
+)
+
+type Project struct {
+	ID          uint
+	CreatedAt   time.Time
+	UpdatedAt   time.Time
+	Name        string `json:"name" form:"name" validate:"required"`
+	Description string `json:"description" form:"description"`
+}
+
+//TODO: Remove this later
+
+type Task struct {
+	ID          uint
+	Title       string `json:"title" form:"title" validate:"required"`
+	Description string `json:"description" form:"description"`
+	Status      string `json:"status" form:"status"`
+	Label       string `json:"label" form:"label"`
+	ProjectID   uint   `json:"projectId" form:"projectId"`
+	CreatedAt   time.Time
+	UpdatedAt   time.Time
+}
+
+type ProjectWithTasks struct {
+	ID          uint
+	CreatedAt   time.Time
+	UpdatedAt   time.Time
+	Name        string `json:"name" form:"name" validate:"required"`
+	Description string `json:"description" form:"description"`
+	Tasks       []Task `json:"tasks"`
+}

api/internal/project/repository.go

@@ -13,7 +13,7 @@ type Repository interface {
 	Create(t *dto.Project) (*dto.Project, error)
 	Update(id int, t *dto.Project) (*dto.Project, error)
 	Delete(id int) (dto.Project, error)
-	GetTasks(id int) (models.Project, error)
+	GetTasks(id int) (dto.ProjectWithTasks, error)
 }
 
 type repository struct {
@@ -64,17 +64,25 @@ func (r repository) Delete(id int) (dto.Project, error) {
 	return project, nil
 }
 
-func (r repository) GetTasks(id int) (models.Project, error) {
+func (r repository) GetTasks(id int) (dto.ProjectWithTasks, error) {
 	project := models.Project{}
-	tasks := []models.Task{}
+	tasks := []dto.Task{}
 	if err := r.db.Find(&project, id).Error; err != nil {
-		return project, err
+		return dto.ProjectWithTasks{}, err
 	}
 
 	if err := r.db.Model(&project).Association("Tasks").Find(&tasks); err != nil {
-		return project, err
+		return dto.ProjectWithTasks{}, err
 	}
-	project.Tasks = tasks
 
-	return project, nil
+	projectWithTasks := dto.ProjectWithTasks{
+		ID:          project.ID,
+		Name:        project.Name,
+		Description: project.Description,
+		CreatedAt:   project.CreatedAt,
+		UpdatedAt:   project.UpdatedAt,
+		Tasks:       tasks,
+	}
+
+	return projectWithTasks, nil
 }

api/internal/project/service.go

@@ -6,7 +6,6 @@ import (
 	"github.com/pacholoamit/GO-TASK-MGR/common/log"
 
 	"github.com/pacholoamit/GO-TASK-MGR/internal/dto"
-	"github.com/pacholoamit/GO-TASK-MGR/internal/models"
 )
 
 type Service interface {
@@ -15,7 +14,7 @@ type Service interface {
 	Create(t *dto.Project) (*dto.Project, error)
 	Update(id int, t *dto.Project) (*dto.Project, error)
 	Delete(id int) (dto.Project, error)
-	GetTasks(id int) (models.Project, error)
+	GetTasks(id int) (dto.ProjectWithTasks, error)
 }
 
 type service struct {
@@ -93,7 +92,7 @@ func (s *service) Delete(id int) (dto.Project, error) {
 	return project, nil
 }
 
-func (s *service) GetTasks(id int) (models.Project, error) {
+func (s *service) GetTasks(id int) (dto.ProjectWithTasks, error) {
 	data, err := s.repo.GetTasks(id)
 	if err != nil {
 		s.logger.Error("Error when Getting tasks:", err)

api/pkg/dbcontext.go

@@ -0,0 +1,22 @@
+package dbcontext
+
+import "gorm.io/gorm"
+
+type DBContext interface {
+	ValidateIfExists(args ...interface{}) error
+}
+
+type dbcontext struct {
+	db *gorm.DB
+}
+
+func NewDbContext(db *gorm.DB) *dbcontext {
+	return &dbcontext{db}
+}
+
+func (d *dbcontext) ValidateIfExists(args ...interface{}) error {
+	if err := d.db.First(args).Error; err != nil {
+		return err
+	}
+	return nil
+}