Renamed remove method for exposed module

This commit is contained in:
Peter Grlica
2020-12-13 18:53:18 +01:00
parent f9bc23f94a
commit 641c0de773
4 changed files with 19 additions and 19 deletions
+1 -1
View File
@@ -122,7 +122,7 @@ endpoints:
name: fields
required: true
title: Exposed module fields
- name: remove
- name: removeExposed
method: DELETE
title: Remove from federation
path: "/modules/{moduleID}/exposed"
+9 -9
View File
@@ -23,7 +23,7 @@ type (
ManageStructureAPI interface {
ReadExposed(context.Context, *request.ManageStructureReadExposed) (interface{}, error)
CreateExposed(context.Context, *request.ManageStructureCreateExposed) (interface{}, error)
Remove(context.Context, *request.ManageStructureRemove) (interface{}, error)
RemoveExposed(context.Context, *request.ManageStructureRemoveExposed) (interface{}, error)
ReadShared(context.Context, *request.ManageStructureReadShared) (interface{}, error)
ListAll(context.Context, *request.ManageStructureListAll) (interface{}, error)
}
@@ -32,7 +32,7 @@ type (
ManageStructure struct {
ReadExposed func(http.ResponseWriter, *http.Request)
CreateExposed func(http.ResponseWriter, *http.Request)
Remove func(http.ResponseWriter, *http.Request)
RemoveExposed func(http.ResponseWriter, *http.Request)
ReadShared func(http.ResponseWriter, *http.Request)
ListAll func(http.ResponseWriter, *http.Request)
}
@@ -80,22 +80,22 @@ func NewManageStructure(h ManageStructureAPI) *ManageStructure {
resputil.JSON(w, value)
}
},
Remove: func(w http.ResponseWriter, r *http.Request) {
RemoveExposed: func(w http.ResponseWriter, r *http.Request) {
defer r.Body.Close()
params := request.NewManageStructureRemove()
params := request.NewManageStructureRemoveExposed()
if err := params.Fill(r); err != nil {
logger.LogParamError("ManageStructure.Remove", r, err)
logger.LogParamError("ManageStructure.RemoveExposed", r, err)
resputil.JSON(w, err)
return
}
value, err := h.Remove(r.Context(), params)
value, err := h.RemoveExposed(r.Context(), params)
if err != nil {
logger.LogControllerError("ManageStructure.Remove", r, err, params.Auditable())
logger.LogControllerError("ManageStructure.RemoveExposed", r, err, params.Auditable())
resputil.JSON(w, err)
return
}
logger.LogControllerCall("ManageStructure.Remove", r, params.Auditable())
logger.LogControllerCall("ManageStructure.RemoveExposed", r, params.Auditable())
if !serveHTTP(value, w, r) {
resputil.JSON(w, value)
}
@@ -148,7 +148,7 @@ func (h ManageStructure) MountRoutes(r chi.Router, middlewares ...func(http.Hand
r.Use(middlewares...)
r.Get("/nodes/{nodeID}/modules/{moduleID}/exposed", h.ReadExposed)
r.Put("/nodes/{nodeID}/modules/{moduleID}/exposed", h.CreateExposed)
r.Delete("/nodes/{nodeID}/modules/{moduleID}/exposed", h.Remove)
r.Delete("/nodes/{nodeID}/modules/{moduleID}/exposed", h.RemoveExposed)
r.Get("/nodes/{nodeID}/modules/{moduleID}/shared", h.ReadShared)
r.Get("/nodes/{nodeID}/modules", h.ListAll)
})
+1 -1
View File
@@ -18,7 +18,7 @@ func (ManageStructure) New() *ManageStructure {
return &ManageStructure{}
}
func (ctrl ManageStructure) Remove(ctx context.Context, r *request.ManageStructureRemove) (interface{}, error) {
func (ctrl ManageStructure) RemoveExposed(ctx context.Context, r *request.ManageStructureRemoveExposed) (interface{}, error) {
return nil, (service.ExposedModule()).DeleteByID(ctx, r.NodeID, r.ModuleID)
}
+8 -8
View File
@@ -65,7 +65,7 @@ type (
Fields types.ModuleFieldMappingList
}
ManageStructureRemove struct {
ManageStructureRemoveExposed struct {
// NodeID PATH parameter
//
// Node ID
@@ -255,13 +255,13 @@ func (r *ManageStructureCreateExposed) Fill(req *http.Request) (err error) {
return err
}
// NewManageStructureRemove request
func NewManageStructureRemove() *ManageStructureRemove {
return &ManageStructureRemove{}
// NewManageStructureRemoveExposed request
func NewManageStructureRemoveExposed() *ManageStructureRemoveExposed {
return &ManageStructureRemoveExposed{}
}
// Auditable returns all auditable/loggable parameters
func (r ManageStructureRemove) Auditable() map[string]interface{} {
func (r ManageStructureRemoveExposed) Auditable() map[string]interface{} {
return map[string]interface{}{
"nodeID": r.NodeID,
"moduleID": r.ModuleID,
@@ -269,17 +269,17 @@ func (r ManageStructureRemove) Auditable() map[string]interface{} {
}
// Auditable returns all auditable/loggable parameters
func (r ManageStructureRemove) GetNodeID() uint64 {
func (r ManageStructureRemoveExposed) GetNodeID() uint64 {
return r.NodeID
}
// Auditable returns all auditable/loggable parameters
func (r ManageStructureRemove) GetModuleID() uint64 {
func (r ManageStructureRemoveExposed) GetModuleID() uint64 {
return r.ModuleID
}
// Fill processes request and fills internal variables
func (r *ManageStructureRemove) Fill(req *http.Request) (err error) {
func (r *ManageStructureRemoveExposed) Fill(req *http.Request) (err error) {
if strings.ToLower(req.Header.Get("content-type")) == "application/json" {
err = json.NewDecoder(req.Body).Decode(r)