DeforaNetworks/corteza
3
0
Fork 0
Code Activity

Add REST API params for compose record owner

Browse Source
This commit is contained in:
Tomaž Jerman
2022-06-02 12:38:51 +02:00
parent 62e43f19d3
commit 9610e35073
3 changed files with 60 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compose/rest.yaml
+8
View File
@@ -849,6 +849,10 @@ endpoints:
name: values
required: false
title: Record values
- type: uint64
name: ownedBy
required: false
title: Record Owner
- type: types.RecordBulkSet
name: records
required: false
@@ -882,6 +886,10 @@ endpoints:
name: values
required: false
title: Record values
- type: uint64
name: ownedBy
required: false
title: Record Owner
- type: types.RecordBulkSet
name: records
required: false
compose/rest/record.go
+2
View File
@@ -168,6 +168,7 @@ func (ctrl *Record) Create(ctx context.Context, r *request.RecordCreate) (interf
ModuleID: r.ModuleID,
Values: r.Values,
Labels: r.Labels,
OwnedBy: r.OwnedBy,
}
oo = append(oo, &types.RecordBulkOperation{
Record: rr,
@@ -218,6 +219,7 @@ func (ctrl *Record) Update(ctx context.Context, r *request.RecordUpdate) (interf
ModuleID: r.ModuleID,
Values: r.Values,
Labels: r.Labels,
OwnedBy: r.OwnedBy,
}
oo = append(oo, &types.RecordBulkOperation{
Record: rr,
compose/rest/request/record.go
+50
View File
@@ -250,6 +250,11 @@ type (
// Record values
Values types.RecordValueSet
// OwnedBy POST parameter
//
// Record Owner
OwnedBy uint64 `json:",string"`
// Records POST parameter
//
// Records
@@ -299,6 +304,11 @@ type (
// Record values
Values types.RecordValueSet
// OwnedBy POST parameter
//
// Record Owner
OwnedBy uint64 `json:",string"`
// Records POST parameter
//
// Records
@@ -1173,6 +1183,7 @@ func (r RecordCreate) Auditable() map[string]interface{} {
"namespaceID": r.NamespaceID,
"moduleID": r.ModuleID,
"values": r.Values,
"ownedBy": r.OwnedBy,
"records": r.Records,
"labels": r.Labels,
}
@@ -1193,6 +1204,11 @@ func (r RecordCreate) GetValues() types.RecordValueSet {
return r.Values
}
// Auditable returns all auditable/loggable parameters
func (r RecordCreate) GetOwnedBy() uint64 {
return r.OwnedBy
}
// Auditable returns all auditable/loggable parameters
func (r RecordCreate) GetRecords() types.RecordBulkSet {
return r.Records
@@ -1224,6 +1240,13 @@ func (r *RecordCreate) Fill(req *http.Request) (err error) {
} else if err == nil {
// Multipart params
if val, ok := req.MultipartForm.Value["ownedBy"]; ok && len(val) > 0 {
r.OwnedBy, err = payload.ParseUint64(val[0]), nil
if err != nil {
return err
}
}
if val, ok := req.MultipartForm.Value["labels[]"]; ok {
r.Labels, err = label.ParseStrings(val)
if err != nil {
@@ -1252,6 +1275,13 @@ func (r *RecordCreate) Fill(req *http.Request) (err error) {
// }
//}
if val, ok := req.Form["ownedBy"]; ok && len(val) > 0 {
r.OwnedBy, err = payload.ParseUint64(val[0]), nil
if err != nil {
return err
}
}
//if val, ok := req.Form["records[]"]; ok && len(val) > 0 {
// r.Records, err = types.RecordBulkSet(val), nil
// if err != nil {
@@ -1364,6 +1394,7 @@ func (r RecordUpdate) Auditable() map[string]interface{} {
"moduleID": r.ModuleID,
"recordID": r.RecordID,
"values": r.Values,
"ownedBy": r.OwnedBy,
"records": r.Records,
"labels": r.Labels,
}
@@ -1389,6 +1420,11 @@ func (r RecordUpdate) GetValues() types.RecordValueSet {
return r.Values
}
// Auditable returns all auditable/loggable parameters
func (r RecordUpdate) GetOwnedBy() uint64 {
return r.OwnedBy
}
// Auditable returns all auditable/loggable parameters
func (r RecordUpdate) GetRecords() types.RecordBulkSet {
return r.Records
@@ -1420,6 +1456,13 @@ func (r *RecordUpdate) Fill(req *http.Request) (err error) {
} else if err == nil {
// Multipart params
if val, ok := req.MultipartForm.Value["ownedBy"]; ok && len(val) > 0 {
r.OwnedBy, err = payload.ParseUint64(val[0]), nil
if err != nil {
return err
}
}
if val, ok := req.MultipartForm.Value["labels[]"]; ok {
r.Labels, err = label.ParseStrings(val)
if err != nil {
@@ -1448,6 +1491,13 @@ func (r *RecordUpdate) Fill(req *http.Request) (err error) {
// }
//}
if val, ok := req.Form["ownedBy"]; ok && len(val) > 0 {
r.OwnedBy, err = payload.ParseUint64(val[0]), nil
if err != nil {
return err
}
}
//if val, ok := req.Form["records[]"]; ok && len(val) > 0 {
// r.Records, err = types.RecordBulkSet(val), nil
// if err != nil {