From fefc75f39292144ce0bebae410dc51987f1959dd Mon Sep 17 00:00:00 2001
From: Denis Arh <denis.arh@kendu.si>
Date: Wed, 1 May 2019 10:24:31 +0200
Subject: [PATCH] Refactor & fix create & read endpoints

---
 compose/rest/chart.go   |  4 +++-
 compose/rest/module.go  | 21 ++++++++++++++-------
 compose/rest/page.go    |  4 +++-
 compose/rest/record.go  | 24 ++++++++++++++++++------
 compose/rest/trigger.go | 23 +++++++++++++----------
 5 files changed, 51 insertions(+), 25 deletions(-)

diff --git a/compose/rest/chart.go b/compose/rest/chart.go
index 683670867..e08552114 100644
--- a/compose/rest/chart.go
+++ b/compose/rest/chart.go
@@ -66,7 +66,9 @@ func (ctrl Chart) Create(ctx context.Context, r *request.ChartCreate) (interface
 }
 
 func (ctrl Chart) Read(ctx context.Context, r *request.ChartRead) (interface{}, error) {
-	return ctrl.chart.With(ctx).FindByID(r.NamespaceID, r.ChartID)
+	mod, err := ctrl.chart.With(ctx).FindByID(r.NamespaceID, r.ChartID)
+	return ctrl.makePayload(ctx, mod, err)
+
 }
 
 func (ctrl Chart) Update(ctx context.Context, r *request.ChartUpdate) (interface{}, error) {
diff --git a/compose/rest/module.go b/compose/rest/module.go
index f1a5435cb..1d625a73c 100644
--- a/compose/rest/module.go
+++ b/compose/rest/module.go
@@ -55,16 +55,23 @@ func (ctrl *Module) List(ctx context.Context, r *request.ModuleList) (interface{
 }
 
 func (ctrl *Module) Read(ctx context.Context, r *request.ModuleRead) (interface{}, error) {
-	return ctrl.module.With(ctx).FindByID(r.NamespaceID, r.ModuleID)
+	mod, err := ctrl.module.With(ctx).FindByID(r.NamespaceID, r.ModuleID)
+	return ctrl.makePayload(ctx, mod, err)
 }
 
 func (ctrl *Module) Create(ctx context.Context, r *request.ModuleCreate) (interface{}, error) {
-	item := &types.Module{
-		Name:   r.Name,
-		Fields: r.Fields,
-		Meta:   r.Meta,
-	}
-	return ctrl.module.With(ctx).Create(item)
+	var (
+		err error
+		mod = &types.Module{
+			NamespaceID: r.NamespaceID,
+			Name:        r.Name,
+			Fields:      r.Fields,
+			Meta:        r.Meta,
+		}
+	)
+
+	mod, err = ctrl.module.With(ctx).Create(mod)
+	return ctrl.makePayload(ctx, mod, err)
 }
 
 func (ctrl *Module) Update(ctx context.Context, r *request.ModuleUpdate) (interface{}, error) {
diff --git a/compose/rest/page.go b/compose/rest/page.go
index 734ec0c32..746646352 100644
--- a/compose/rest/page.go
+++ b/compose/rest/page.go
@@ -76,7 +76,9 @@ func (ctrl *Page) Create(ctx context.Context, r *request.PageCreate) (interface{
 }
 
 func (ctrl *Page) Read(ctx context.Context, r *request.PageRead) (interface{}, error) {
-	return ctrl.page.With(ctx).FindByID(r.NamespaceID, r.PageID)
+	mod, err := ctrl.page.With(ctx).FindByID(r.NamespaceID, r.PageID)
+	return ctrl.makePayload(ctx, mod, err)
+
 }
 
 func (ctrl *Page) Reorder(ctx context.Context, r *request.PageReorder) (interface{}, error) {
diff --git a/compose/rest/record.go b/compose/rest/record.go
index c2c3d91fe..3d0598367 100644
--- a/compose/rest/record.go
+++ b/compose/rest/record.go
@@ -59,18 +59,30 @@ func (ctrl *Record) List(ctx context.Context, r *request.RecordList) (interface{
 }
 
 func (ctrl *Record) Read(ctx context.Context, r *request.RecordRead) (interface{}, error) {
-	return ctrl.record.With(ctx).FindByID(r.NamespaceID, r.RecordID)
+	mod, err := ctrl.record.With(ctx).FindByID(r.NamespaceID, r.RecordID)
+
+	return ctrl.makePayload(ctx, mod, err)
 }
 
 func (ctrl *Record) Create(ctx context.Context, r *request.RecordCreate) (interface{}, error) {
-	return ctrl.record.With(ctx).Create(&types.Record{ModuleID: r.ModuleID, Values: r.Values})
+	mod, err := ctrl.record.With(ctx).Create(&types.Record{
+		NamespaceID: r.NamespaceID,
+		ModuleID:    r.ModuleID,
+		Values:      r.Values,
+	})
+
+	return ctrl.makePayload(ctx, mod, err)
 }
 
 func (ctrl *Record) Update(ctx context.Context, r *request.RecordUpdate) (interface{}, error) {
-	return ctrl.record.With(ctx).Update(&types.Record{
-		ID:       r.RecordID,
-		ModuleID: r.ModuleID,
-		Values:   r.Values})
+	mod, err := ctrl.record.With(ctx).Update(&types.Record{
+		ID:          r.RecordID,
+		NamespaceID: r.NamespaceID,
+		ModuleID:    r.ModuleID,
+		Values:      r.Values,
+	})
+
+	return ctrl.makePayload(ctx, mod, err)
 }
 
 func (ctrl *Record) Delete(ctx context.Context, r *request.RecordDelete) (interface{}, error) {
diff --git a/compose/rest/trigger.go b/compose/rest/trigger.go
index 78392d03d..ec3b2da1d 100644
--- a/compose/rest/trigger.go
+++ b/compose/rest/trigger.go
@@ -49,22 +49,25 @@ func (ctrl Trigger) List(ctx context.Context, r *request.TriggerList) (interface
 }
 
 func (ctrl Trigger) Create(ctx context.Context, r *request.TriggerCreate) (interface{}, error) {
-	var err error
-	ns := &types.Trigger{
-		NamespaceID: r.NamespaceID,
-		ModuleID:    r.ModuleID,
-		Name:        r.Name,
-		Actions:     r.Actions,
-		Enabled:     r.Enabled,
-		Source:      r.Source,
-	}
+	var (
+		err error
+		ns  = &types.Trigger{
+			NamespaceID: r.NamespaceID,
+			ModuleID:    r.ModuleID,
+			Name:        r.Name,
+			Actions:     r.Actions,
+			Enabled:     r.Enabled,
+			Source:      r.Source,
+		}
+	)
 
 	ns, err = ctrl.trigger.With(ctx).Create(ns)
 	return ctrl.makePayload(ctx, ns, err)
 }
 
 func (ctrl Trigger) Read(ctx context.Context, r *request.TriggerRead) (interface{}, error) {
-	return ctrl.trigger.With(ctx).FindByID(r.NamespaceID, r.TriggerID)
+	mod, err := ctrl.trigger.With(ctx).FindByID(r.NamespaceID, r.TriggerID)
+	return ctrl.makePayload(ctx, mod, err)
 }
 
 func (ctrl Trigger) Update(ctx context.Context, r *request.TriggerUpdate) (interface{}, error) {