DeforaNetworks/corteza
3
0
Fork 0
Code Activity

Refactor & fix create & read endpoints

Browse Source
This commit is contained in:
Denis Arh
2019-05-01 10:24:31 +02:00
parent a9358610f5
commit fefc75f392
5 changed files with 51 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compose/rest/chart.go
+3 -1
View File
@@ -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) {
compose/rest/module.go
+14 -7
View File
@@ -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) {
compose/rest/page.go
+3 -1
View File
@@ -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) {
compose/rest/record.go
+18 -6
View File
@@ -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) {
compose/rest/trigger.go
+13 -10
View File
@@ -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) {