add item composition in projects.

models/log.go

@@ -67,14 +67,19 @@ type LogResult struct {
 	SecondaryItem *Item            `json:"secondaryItem"`
 }
 
+type LogWithSecondaryItem struct {
+	Log
+	SecondaryItem *Item `json:"secondaryItem,omitempty"`
+}
+
 type LogFilter struct {
-	UserID  string
+	UserID          string
 	ProjectGroupIDs []string
-	ProjectIDs []string
-	TaskIDs []string
-	ItemIDs []string
-	MinTime *time.Time
-	MaxTime *time.Time
+	ProjectIDs      []string
+	TaskIDs         []string
+	ItemIDs         []string
+	MinTime         *time.Time
+	MaxTime         *time.Time
 }
 
 type LogRepository interface {

models/task.go

@@ -79,10 +79,10 @@ type TaskWithProject struct {
 
 type TaskResult struct {
 	Task
-	Item            *Item    `json:"item"`
-	Logs            []*Log   `json:"logs"`
-	CompletedAmount int      `json:"completedAmount"`
-	Project         *Project `json:"project,omitempty"`
+	Item            *Item                   `json:"item"`
+	Logs            []*LogWithSecondaryItem `json:"logs"`
+	CompletedAmount int                     `json:"completedAmount"`
+	Project         *Project                `json:"project,omitempty"`
 }
 
 type TaskFilter struct {