diff --git a/controllers/shared_workspace.go b/controllers/collaborative_area.go similarity index 71% rename from controllers/shared_workspace.go rename to controllers/collaborative_area.go index 94d7eaa..828c8a0 100644 --- a/controllers/shared_workspace.go +++ b/controllers/collaborative_area.go @@ -12,7 +12,7 @@ import ( ) // Operations about workspace -type SharedWorkspaceController struct { +type CollaborativeAreaController struct { beego.Controller } @@ -21,10 +21,10 @@ type SharedWorkspaceController struct { // @Param search path string true "the word search you want to get" // @Success 200 {shared workspace} models.shared_workspace // @router /search/:search [get] -func (o *SharedWorkspaceController) Search() { +func (o *CollaborativeAreaController) Search() { // store and return Id or post with UUID search := o.Ctx.Input.Param(":search") - o.Data["json"] = oclib.Search(nil, search, oclib.LibDataEnum(oclib.SHARED_WORKSPACE)) + o.Data["json"] = oclib.Search(nil, search, oclib.LibDataEnum(utils.COLLABORATIVE_AREA)) o.ServeJSON() } @@ -34,12 +34,12 @@ func (o *SharedWorkspaceController) Search() { // @Param body body models.workspace true "The shared workspace content" // @Success 200 {shared workspace} models.shared_workspace // @router /:id [put] -func (o *SharedWorkspaceController) Put() { +func (o *CollaborativeAreaController) Put() { // store and return Id or post with UUID var paths = map[string]map[tools.METHOD]string{ // paths used to send to peers - utils.SHARED_WORKSPACE.String(): { - tools.DELETE: oclib.GetPath(oclib.LibDataEnum(oclib.SHARED_WORKSPACE)) + "/oc/shared/workspace/:id", - tools.POST: oclib.GetPath(oclib.LibDataEnum(oclib.SHARED_WORKSPACE)) + "/oc/shared/workspace/", + utils.COLLABORATIVE_AREA.String(): { + tools.DELETE: oclib.GetPath(oclib.LibDataEnum(utils.COLLABORATIVE_AREA)) + "/oc/shared/workspace/:id", + tools.POST: oclib.GetPath(oclib.LibDataEnum(utils.COLLABORATIVE_AREA)) + "/oc/shared/workspace/", }, utils.WORKSPACE.String(): { tools.DELETE: oclib.GetPath(oclib.LibDataEnum(oclib.WORKSPACE)) + "/oc/workspace/:id", @@ -58,7 +58,7 @@ func (o *SharedWorkspaceController) Put() { json.Unmarshal(o.Ctx.Input.CopyBody(10000), &res) caller := tools.NewHTTPCaller(paths) // caller used to send to peers fmt.Println("UPDATE", res) - o.Data["json"] = oclib.UpdateOne(oclib.LibDataEnum(oclib.SHARED_WORKSPACE), res, id, caller) + o.Data["json"] = oclib.UpdateOne(oclib.LibDataEnum(utils.COLLABORATIVE_AREA), res, id, caller) o.ServeJSON() } @@ -67,11 +67,11 @@ func (o *SharedWorkspaceController) Put() { // @Param data body json true "body for data content (Json format)" // @Success 200 {shared workspace} models.shared_workspace // @router / [post] -func (o *SharedWorkspaceController) Post() { +func (o *CollaborativeAreaController) Post() { var paths = map[string]map[tools.METHOD]string{ // paths used to call other OC services - utils.SHARED_WORKSPACE.String(): { - tools.DELETE: oclib.GetPath(oclib.LibDataEnum(oclib.SHARED_WORKSPACE)) + "/oc/shared/workspace/:id", - tools.POST: oclib.GetPath(oclib.LibDataEnum(oclib.SHARED_WORKSPACE)) + "/oc/shared/workspace/", + utils.COLLABORATIVE_AREA.String(): { + tools.DELETE: oclib.GetPath(oclib.LibDataEnum(utils.COLLABORATIVE_AREA)) + "/oc/shared/workspace/:id", + tools.POST: oclib.GetPath(oclib.LibDataEnum(utils.COLLABORATIVE_AREA)) + "/oc/shared/workspace/", }, utils.WORKSPACE.String(): { tools.DELETE: oclib.GetPath(oclib.LibDataEnum(oclib.WORKSPACE)) + "/oc/workspace/:id", @@ -89,7 +89,7 @@ func (o *SharedWorkspaceController) Post() { var res map[string]interface{} json.Unmarshal(o.Ctx.Input.CopyBody(10000), &res) - o.Data["json"] = oclib.StoreOne(oclib.LibDataEnum(oclib.SHARED_WORKSPACE), res, caller) + o.Data["json"] = oclib.StoreOne(oclib.LibDataEnum(utils.COLLABORATIVE_AREA), res, caller) o.ServeJSON() } @@ -97,8 +97,8 @@ func (o *SharedWorkspaceController) Post() { // @Description find shared workspace by id // @Success 200 {shared_workspace} models.shared_workspace // @router / [get] -func (o *SharedWorkspaceController) GetAll() { - o.Data["json"] = oclib.LoadAll(oclib.LibDataEnum(oclib.SHARED_WORKSPACE)) +func (o *CollaborativeAreaController) GetAll() { + o.Data["json"] = oclib.LoadAll(oclib.LibDataEnum(utils.COLLABORATIVE_AREA)) o.ServeJSON() } @@ -107,9 +107,9 @@ func (o *SharedWorkspaceController) GetAll() { // @Param id path string true "the id you want to get" // @Success 200 {shared workspace} models.shared_workspace // @router /:id [get] -func (o *SharedWorkspaceController) Get() { +func (o *CollaborativeAreaController) Get() { id := o.Ctx.Input.Param(":id") - o.Data["json"] = oclib.LoadOne(oclib.LibDataEnum(oclib.SHARED_WORKSPACE), id) + o.Data["json"] = oclib.LoadOne(oclib.LibDataEnum(utils.COLLABORATIVE_AREA), id) o.ServeJSON() } @@ -119,11 +119,11 @@ func (o *SharedWorkspaceController) Get() { // @Param id2 path string true "the id you want to add" // @Success 200 {shared workspace} models.shared_workspace // @router /:id/workspace/:id2 [delete] -func (o *SharedWorkspaceController) RemoveWorkspace() { +func (o *CollaborativeAreaController) RemoveWorkspace() { var paths = map[string]map[tools.METHOD]string{ // paths used to call other OC services - utils.SHARED_WORKSPACE.String(): { - tools.DELETE: oclib.GetPath(oclib.LibDataEnum(oclib.SHARED_WORKSPACE)) + "/oc/shared/workspace/:id", - tools.POST: oclib.GetPath(oclib.LibDataEnum(oclib.SHARED_WORKSPACE)) + "/oc/shared/workspace/", + utils.COLLABORATIVE_AREA.String(): { + tools.DELETE: oclib.GetPath(oclib.LibDataEnum(utils.COLLABORATIVE_AREA)) + "/oc/shared/workspace/:id", + tools.POST: oclib.GetPath(oclib.LibDataEnum(utils.COLLABORATIVE_AREA)) + "/oc/shared/workspace/", }, utils.WORKSPACE.String(): { tools.DELETE: oclib.GetPath(oclib.LibDataEnum(oclib.WORKSPACE)) + "/oc/workspace/:id", @@ -140,8 +140,8 @@ func (o *SharedWorkspaceController) RemoveWorkspace() { caller := tools.NewHTTPCaller(paths) // caller used to send to peers id := o.Ctx.Input.Param(":id") id2 := o.Ctx.Input.Param(":id2") - r := oclib.LoadOne(oclib.LibDataEnum(oclib.SHARED_WORKSPACE), id) - shared := r.ToSharedWorkspace() + r := oclib.LoadOne(oclib.LibDataEnum(utils.COLLABORATIVE_AREA), id) + shared := r.ToCollaborativeArea() newWorkspace := []string{} if slices.Contains(shared.Workspaces, id2) { for _, w := range shared.Workspaces { @@ -151,7 +151,7 @@ func (o *SharedWorkspaceController) RemoveWorkspace() { } shared.Workspaces = newWorkspace } - o.Data["json"] = oclib.UpdateOne(oclib.LibDataEnum(oclib.SHARED_WORKSPACE), shared.Serialize(), id, caller) + o.Data["json"] = oclib.UpdateOne(oclib.LibDataEnum(utils.COLLABORATIVE_AREA), shared.Serialize(), id, caller) o.ServeJSON() } @@ -161,11 +161,11 @@ func (o *SharedWorkspaceController) RemoveWorkspace() { // @Param id2 path string true "the id you want to add" // @Success 200 {shared workspace} models.shared_workspace // @router /:id/workflow/:id2 [delete] -func (o *SharedWorkspaceController) RemoveWorkflow() { +func (o *CollaborativeAreaController) RemoveWorkflow() { var paths = map[string]map[tools.METHOD]string{ // paths used to call other OC services - utils.SHARED_WORKSPACE.String(): { - tools.DELETE: oclib.GetPath(oclib.LibDataEnum(oclib.SHARED_WORKSPACE)) + "/oc/shared/workspace/:id", - tools.POST: oclib.GetPath(oclib.LibDataEnum(oclib.SHARED_WORKSPACE)) + "/oc/shared/workspace/", + utils.COLLABORATIVE_AREA.String(): { + tools.DELETE: oclib.GetPath(oclib.LibDataEnum(utils.COLLABORATIVE_AREA)) + "/oc/shared/workspace/:id", + tools.POST: oclib.GetPath(oclib.LibDataEnum(utils.COLLABORATIVE_AREA)) + "/oc/shared/workspace/", }, utils.WORKSPACE.String(): { tools.DELETE: oclib.GetPath(oclib.LibDataEnum(oclib.WORKSPACE)) + "/oc/workspace/:id", @@ -182,9 +182,9 @@ func (o *SharedWorkspaceController) RemoveWorkflow() { caller := tools.NewHTTPCaller(paths) // caller used to send to peers id := o.Ctx.Input.Param(":id") id2 := o.Ctx.Input.Param(":id2") - r := oclib.LoadOne(oclib.LibDataEnum(oclib.SHARED_WORKSPACE), id) + r := oclib.LoadOne(oclib.LibDataEnum(utils.COLLABORATIVE_AREA), id) fmt.Println("RemoveWorkflow", r) - shared := r.ToSharedWorkspace() + shared := r.ToCollaborativeArea() newWorkflows := []string{} if slices.Contains(shared.Workflows, id2) { for _, w := range shared.Workflows { @@ -194,7 +194,7 @@ func (o *SharedWorkspaceController) RemoveWorkflow() { } shared.Workflows = newWorkflows } - o.Data["json"] = oclib.UpdateOne(oclib.LibDataEnum(oclib.SHARED_WORKSPACE), shared.Serialize(), id, caller) + o.Data["json"] = oclib.UpdateOne(oclib.LibDataEnum(utils.COLLABORATIVE_AREA), shared.Serialize(), id, caller) o.ServeJSON() } @@ -204,11 +204,11 @@ func (o *SharedWorkspaceController) RemoveWorkflow() { // @Param id2 path string true "the id you want to add" // @Success 200 {shared workspace} models.shared_workspace // @router /:id/peer/:id2 [delete] -func (o *SharedWorkspaceController) RemovePeer() { +func (o *CollaborativeAreaController) RemovePeer() { var paths = map[string]map[tools.METHOD]string{ // paths used to call other OC services - utils.SHARED_WORKSPACE.String(): { - tools.DELETE: oclib.GetPath(oclib.LibDataEnum(oclib.SHARED_WORKSPACE)) + "/oc/shared/workspace/:id", - tools.POST: oclib.GetPath(oclib.LibDataEnum(oclib.SHARED_WORKSPACE)) + "/oc/shared/workspace/", + utils.COLLABORATIVE_AREA.String(): { + tools.DELETE: oclib.GetPath(oclib.LibDataEnum(utils.COLLABORATIVE_AREA)) + "/oc/shared/workspace/:id", + tools.POST: oclib.GetPath(oclib.LibDataEnum(utils.COLLABORATIVE_AREA)) + "/oc/shared/workspace/", }, utils.WORKSPACE.String(): { tools.DELETE: oclib.GetPath(oclib.LibDataEnum(oclib.WORKSPACE)) + "/oc/workspace/:id", @@ -225,8 +225,8 @@ func (o *SharedWorkspaceController) RemovePeer() { caller := tools.NewHTTPCaller(paths) // caller used to send to peers id := o.Ctx.Input.Param(":id") id2 := o.Ctx.Input.Param(":id2") - r := oclib.LoadOne(oclib.LibDataEnum(oclib.SHARED_WORKSPACE), id) - shared := r.ToSharedWorkspace() + r := oclib.LoadOne(oclib.LibDataEnum(utils.COLLABORATIVE_AREA), id) + shared := r.ToCollaborativeArea() newPeers := []string{} if shared.CreatorID != id2 { o.Data["json"] = map[string]interface{}{ @@ -245,7 +245,7 @@ func (o *SharedWorkspaceController) RemovePeer() { } shared.Peers = newPeers } - o.Data["json"] = oclib.UpdateOne(oclib.LibDataEnum(oclib.SHARED_WORKSPACE), shared.Serialize(), id, caller) + o.Data["json"] = oclib.UpdateOne(oclib.LibDataEnum(utils.COLLABORATIVE_AREA), shared.Serialize(), id, caller) o.ServeJSON() } @@ -255,11 +255,11 @@ func (o *SharedWorkspaceController) RemovePeer() { // @Param id2 path string true "the id you want to add" // @Success 200 {shared workspace} models.shared_workspace // @router /:id/rule/:id2 [delete] -func (o *SharedWorkspaceController) RemoveRule() { +func (o *CollaborativeAreaController) RemoveRule() { var paths = map[string]map[tools.METHOD]string{ // paths used to call other OC services - utils.SHARED_WORKSPACE.String(): { - tools.DELETE: oclib.GetPath(oclib.LibDataEnum(oclib.SHARED_WORKSPACE)) + "/oc/shared/workspace/:id", - tools.POST: oclib.GetPath(oclib.LibDataEnum(oclib.SHARED_WORKSPACE)) + "/oc/shared/workspace/", + utils.COLLABORATIVE_AREA.String(): { + tools.DELETE: oclib.GetPath(oclib.LibDataEnum(utils.COLLABORATIVE_AREA)) + "/oc/shared/workspace/:id", + tools.POST: oclib.GetPath(oclib.LibDataEnum(utils.COLLABORATIVE_AREA)) + "/oc/shared/workspace/", }, utils.WORKSPACE.String(): { tools.DELETE: oclib.GetPath(oclib.LibDataEnum(oclib.WORKSPACE)) + "/oc/workspace/:id", @@ -276,8 +276,8 @@ func (o *SharedWorkspaceController) RemoveRule() { caller := tools.NewHTTPCaller(paths) // caller used to send to peers id := o.Ctx.Input.Param(":id") id2 := o.Ctx.Input.Param(":id2") - r := oclib.LoadOne(oclib.LibDataEnum(oclib.SHARED_WORKSPACE), id) - shared := r.ToSharedWorkspace() + r := oclib.LoadOne(oclib.LibDataEnum(utils.COLLABORATIVE_AREA), id) + shared := r.ToCollaborativeArea() newRules := []string{} if shared != nil && slices.Contains(shared.Rules, id2) { for _, rule := range shared.Rules { @@ -287,7 +287,7 @@ func (o *SharedWorkspaceController) RemoveRule() { } shared.Rules = newRules } - o.Data["json"] = oclib.UpdateOne(oclib.LibDataEnum(oclib.SHARED_WORKSPACE), shared.Serialize(), id, caller) + o.Data["json"] = oclib.UpdateOne(oclib.LibDataEnum(utils.COLLABORATIVE_AREA), shared.Serialize(), id, caller) o.ServeJSON() } @@ -297,11 +297,11 @@ func (o *SharedWorkspaceController) RemoveRule() { // @Param id2 path string true "the id you want to add" // @Success 200 {shared workspace} models.shared_workspace // @router /:id/workspace/:id2 [post] -func (o *SharedWorkspaceController) AddWorkspace() { +func (o *CollaborativeAreaController) AddWorkspace() { var paths = map[string]map[tools.METHOD]string{ // paths used to call other OC services - utils.SHARED_WORKSPACE.String(): { - tools.DELETE: oclib.GetPath(oclib.LibDataEnum(oclib.SHARED_WORKSPACE)) + "/oc/shared/workspace/:id", - tools.POST: oclib.GetPath(oclib.LibDataEnum(oclib.SHARED_WORKSPACE)) + "/oc/shared/workspace/", + utils.COLLABORATIVE_AREA.String(): { + tools.DELETE: oclib.GetPath(oclib.LibDataEnum(utils.COLLABORATIVE_AREA)) + "/oc/shared/workspace/:id", + tools.POST: oclib.GetPath(oclib.LibDataEnum(utils.COLLABORATIVE_AREA)) + "/oc/shared/workspace/", }, utils.WORKSPACE.String(): { tools.DELETE: oclib.GetPath(oclib.LibDataEnum(oclib.WORKSPACE)) + "/oc/workspace/:id", @@ -318,17 +318,17 @@ func (o *SharedWorkspaceController) AddWorkspace() { caller := tools.NewHTTPCaller(paths) // caller used to send to peers id := o.Ctx.Input.Param(":id") id2 := o.Ctx.Input.Param(":id2") - r := oclib.LoadOne(oclib.LibDataEnum(oclib.SHARED_WORKSPACE), id) + r := oclib.LoadOne(oclib.LibDataEnum(utils.COLLABORATIVE_AREA), id) if r.Code != 200 { o.Data["json"] = r o.ServeJSON() return } - shared := r.ToSharedWorkspace() + shared := r.ToCollaborativeArea() if shared != nil && !slices.Contains(shared.Workspaces, id2) { shared.Workspaces = append(shared.Workspaces, id2) } - o.Data["json"] = oclib.UpdateOne(oclib.LibDataEnum(oclib.SHARED_WORKSPACE), shared.Serialize(), id, caller) + o.Data["json"] = oclib.UpdateOne(oclib.LibDataEnum(utils.COLLABORATIVE_AREA), shared.Serialize(), id, caller) o.ServeJSON() } @@ -338,11 +338,11 @@ func (o *SharedWorkspaceController) AddWorkspace() { // @Param id2 path string true "the id you want to add" // @Success 200 {shared workspace} models.shared_workspace // @router /:id/workflow/:id2 [post] -func (o *SharedWorkspaceController) AddWorkflow() { +func (o *CollaborativeAreaController) AddWorkflow() { var paths = map[string]map[tools.METHOD]string{ // paths used to call other OC services - utils.SHARED_WORKSPACE.String(): { - tools.DELETE: oclib.GetPath(oclib.LibDataEnum(oclib.SHARED_WORKSPACE)) + "/oc/shared/workspace/:id", - tools.POST: oclib.GetPath(oclib.LibDataEnum(oclib.SHARED_WORKSPACE)) + "/oc/shared/workspace/", + utils.COLLABORATIVE_AREA.String(): { + tools.DELETE: oclib.GetPath(oclib.LibDataEnum(utils.COLLABORATIVE_AREA)) + "/oc/shared/workspace/:id", + tools.POST: oclib.GetPath(oclib.LibDataEnum(utils.COLLABORATIVE_AREA)) + "/oc/shared/workspace/", }, utils.WORKSPACE.String(): { tools.DELETE: oclib.GetPath(oclib.LibDataEnum(oclib.WORKSPACE)) + "/oc/workspace/:id", @@ -360,14 +360,14 @@ func (o *SharedWorkspaceController) AddWorkflow() { id := o.Ctx.Input.Param(":id") id2 := o.Ctx.Input.Param(":id2") fmt.Println("AddWorkflow", id, id2) - r := oclib.LoadOne(oclib.LibDataEnum(oclib.SHARED_WORKSPACE), id) - shared := r.ToSharedWorkspace() + r := oclib.LoadOne(oclib.LibDataEnum(utils.COLLABORATIVE_AREA), id) + shared := r.ToCollaborativeArea() if shared != nil && !slices.Contains(shared.Workflows, id2) { shared.Workflows = append(shared.Workflows, id2) } fmt.Println("AddWorkflow", shared.Workflows) - o.Data["json"] = oclib.UpdateOne(oclib.LibDataEnum(oclib.SHARED_WORKSPACE), shared.Serialize(), id, caller) + o.Data["json"] = oclib.UpdateOne(oclib.LibDataEnum(utils.COLLABORATIVE_AREA), shared.Serialize(), id, caller) o.ServeJSON() } @@ -377,11 +377,11 @@ func (o *SharedWorkspaceController) AddWorkflow() { // @Param id2 path string true "the id you want to add" // @Success 200 {shared workspace} models.shared_workspace // @router /:id/peer/:id2 [post] -func (o *SharedWorkspaceController) AddPeer() { +func (o *CollaborativeAreaController) AddPeer() { var paths = map[string]map[tools.METHOD]string{ // paths used to call other OC services - utils.SHARED_WORKSPACE.String(): { - tools.DELETE: oclib.GetPath(oclib.LibDataEnum(oclib.SHARED_WORKSPACE)) + "/oc/shared/workspace/:id", - tools.POST: oclib.GetPath(oclib.LibDataEnum(oclib.SHARED_WORKSPACE)) + "/oc/shared/workspace/", + utils.COLLABORATIVE_AREA.String(): { + tools.DELETE: oclib.GetPath(oclib.LibDataEnum(utils.COLLABORATIVE_AREA)) + "/oc/shared/workspace/:id", + tools.POST: oclib.GetPath(oclib.LibDataEnum(utils.COLLABORATIVE_AREA)) + "/oc/shared/workspace/", }, utils.WORKSPACE.String(): { tools.DELETE: oclib.GetPath(oclib.LibDataEnum(oclib.WORKSPACE)) + "/oc/workspace/:id", @@ -398,12 +398,12 @@ func (o *SharedWorkspaceController) AddPeer() { caller := tools.NewHTTPCaller(paths) // caller used to send to peers id := o.Ctx.Input.Param(":id") id2 := o.Ctx.Input.Param(":id2") - r := oclib.LoadOne(oclib.LibDataEnum(oclib.SHARED_WORKSPACE), id) - shared := r.ToSharedWorkspace() + r := oclib.LoadOne(oclib.LibDataEnum(utils.COLLABORATIVE_AREA), id) + shared := r.ToCollaborativeArea() if shared != nil && !slices.Contains(shared.Peers, id2) { shared.Peers = append(shared.Peers, id2) } - o.Data["json"] = oclib.UpdateOne(oclib.LibDataEnum(oclib.SHARED_WORKSPACE), shared.Serialize(), id, caller) + o.Data["json"] = oclib.UpdateOne(oclib.LibDataEnum(utils.COLLABORATIVE_AREA), shared.Serialize(), id, caller) o.ServeJSON() } @@ -413,11 +413,11 @@ func (o *SharedWorkspaceController) AddPeer() { // @Param id2 path string true "the id you want to add" // @Success 200 {shared workspace} models.shared_workspace // @router /:id/rule/:id2 [post] -func (o *SharedWorkspaceController) AddRule() { +func (o *CollaborativeAreaController) AddRule() { var paths = map[string]map[tools.METHOD]string{ // paths used to send to peers - utils.SHARED_WORKSPACE.String(): { - tools.DELETE: oclib.GetPath(oclib.LibDataEnum(oclib.SHARED_WORKSPACE)) + "/oc/shared/workspace/:id", - tools.POST: oclib.GetPath(oclib.LibDataEnum(oclib.SHARED_WORKSPACE)) + "/oc/shared/workspace/", + utils.COLLABORATIVE_AREA.String(): { + tools.DELETE: oclib.GetPath(oclib.LibDataEnum(utils.COLLABORATIVE_AREA)) + "/oc/shared/workspace/:id", + tools.POST: oclib.GetPath(oclib.LibDataEnum(utils.COLLABORATIVE_AREA)) + "/oc/shared/workspace/", }, utils.WORKSPACE.String(): { tools.DELETE: oclib.GetPath(oclib.LibDataEnum(oclib.WORKSPACE)) + "/oc/workspace/:id", @@ -434,12 +434,12 @@ func (o *SharedWorkspaceController) AddRule() { caller := tools.NewHTTPCaller(paths) // caller used to send to peers id := o.Ctx.Input.Param(":id") id2 := o.Ctx.Input.Param(":id2") - r := oclib.LoadOne(oclib.LibDataEnum(oclib.SHARED_WORKSPACE), id) - shared := r.ToSharedWorkspace() + r := oclib.LoadOne(oclib.LibDataEnum(utils.COLLABORATIVE_AREA), id) + shared := r.ToCollaborativeArea() if shared != nil && !slices.Contains(shared.Rules, id2) { shared.Rules = append(shared.Rules, id2) } - o.Data["json"] = oclib.UpdateOne(oclib.LibDataEnum(oclib.SHARED_WORKSPACE), shared.Serialize(), id, caller) + o.Data["json"] = oclib.UpdateOne(oclib.LibDataEnum(utils.COLLABORATIVE_AREA), shared.Serialize(), id, caller) o.ServeJSON() } @@ -448,11 +448,11 @@ func (o *SharedWorkspaceController) AddRule() { // @Param id path string true "The id you want to delete" // @Success 200 {shared workspace} delete success! // @router /:id [delete] -func (o *SharedWorkspaceController) Delete() { +func (o *CollaborativeAreaController) Delete() { var paths = map[string]map[tools.METHOD]string{ // paths used to send to peers - utils.SHARED_WORKSPACE.String(): { - tools.DELETE: oclib.GetPath(oclib.LibDataEnum(oclib.SHARED_WORKSPACE)) + "/oc/shared/workspace/:id", - tools.POST: oclib.GetPath(oclib.LibDataEnum(oclib.SHARED_WORKSPACE)) + "/oc/shared/workspace/", + utils.COLLABORATIVE_AREA.String(): { + tools.DELETE: oclib.GetPath(oclib.LibDataEnum(utils.COLLABORATIVE_AREA)) + "/oc/shared/workspace/:id", + tools.POST: oclib.GetPath(oclib.LibDataEnum(utils.COLLABORATIVE_AREA)) + "/oc/shared/workspace/", }, utils.WORKSPACE.String(): { tools.DELETE: oclib.GetPath(oclib.LibDataEnum(oclib.WORKSPACE)) + "/oc/workspace/:id", @@ -468,6 +468,6 @@ func (o *SharedWorkspaceController) Delete() { } id := o.Ctx.Input.Param(":id") caller := tools.NewHTTPCaller(paths) // caller used to send to peers - o.Data["json"] = oclib.DeleteOne(oclib.LibDataEnum(oclib.SHARED_WORKSPACE), id, caller) + o.Data["json"] = oclib.DeleteOne(oclib.LibDataEnum(utils.COLLABORATIVE_AREA), id, caller) o.ServeJSON() } diff --git a/go.mod b/go.mod index 3b4fbf4..37b2af5 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.22.0 toolchain go1.22.4 require ( - cloud.o-forge.io/core/oc-lib v0.0.0-20240904135449-4f0ab6a3760f + cloud.o-forge.io/core/oc-lib v0.0.0-20240927112324-cdf513c2c454 github.com/beego/beego/v2 v2.3.0 ) @@ -16,12 +16,12 @@ require ( github.com/gabriel-vasile/mimetype v1.4.5 // indirect github.com/go-playground/locales v0.14.1 // indirect github.com/go-playground/universal-translator v0.18.1 // indirect - github.com/go-playground/validator/v10 v10.22.0 // indirect + github.com/go-playground/validator/v10 v10.22.1 // indirect github.com/golang/snappy v0.0.4 // indirect github.com/google/uuid v1.6.0 // indirect github.com/goraz/onion v0.1.3 // indirect github.com/hashicorp/golang-lru v1.0.2 // indirect - github.com/klauspost/compress v1.17.9 // indirect + github.com/klauspost/compress v1.17.10 // indirect github.com/kr/text v0.2.0 // indirect github.com/leodido/go-urn v1.4.0 // indirect github.com/mattn/go-colorable v0.1.13 // indirect @@ -46,9 +46,9 @@ require ( github.com/xdg-go/scram v1.1.2 // indirect github.com/xdg-go/stringprep v1.0.4 // indirect github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 // indirect - go.mongodb.org/mongo-driver v1.16.1 // indirect - golang.org/x/crypto v0.26.0 // indirect - golang.org/x/net v0.28.0 // indirect + go.mongodb.org/mongo-driver v1.17.0 // indirect + golang.org/x/crypto v0.27.0 // indirect + golang.org/x/net v0.29.0 // indirect golang.org/x/sync v0.8.0 // indirect golang.org/x/sys v0.25.0 // indirect golang.org/x/text v0.18.0 // indirect diff --git a/go.sum b/go.sum index f8e21cd..5cddd60 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,7 @@ cloud.o-forge.io/core/oc-lib v0.0.0-20240904135449-4f0ab6a3760f h1:v9mw3uNg/DJswOvHooMu8/BMedA+vIXbma+8iUwsjUI= cloud.o-forge.io/core/oc-lib v0.0.0-20240904135449-4f0ab6a3760f/go.mod h1:FIJD0taWLJ5pjQLJ6sfE2KlTkvbmk5SMcyrxdjsaVz0= +cloud.o-forge.io/core/oc-lib v0.0.0-20240927112324-cdf513c2c454 h1:F5/oBMypnb6Mdvcf6N8y8v/DgfglPQ6VsQUY7hjC2zA= +cloud.o-forge.io/core/oc-lib v0.0.0-20240927112324-cdf513c2c454/go.mod h1:FIJD0taWLJ5pjQLJ6sfE2KlTkvbmk5SMcyrxdjsaVz0= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/beego/beego/v2 v2.3.0 h1:iECVwzm6egw6iw6tkWrEDqXG4NQtKLQ6QBSYqlM6T/I= github.com/beego/beego/v2 v2.3.0/go.mod h1:Ob/5BJ9fIKZLd4s9ZV3o9J6odkkIyL83et+p98gyYXo= @@ -29,6 +31,8 @@ github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJn github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY= github.com/go-playground/validator/v10 v10.22.0 h1:k6HsTZ0sTnROkhS//R0O+55JgM8C4Bx7ia+JlgcnOao= github.com/go-playground/validator/v10 v10.22.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM= +github.com/go-playground/validator/v10 v10.22.1 h1:40JcKH+bBNGFczGuoBYgX4I6m/i27HYW8P9FDk5PbgA= +github.com/go-playground/validator/v10 v10.22.1/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= @@ -49,6 +53,8 @@ github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA= github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= +github.com/klauspost/compress v1.17.10 h1:oXAz+Vh0PMUvJczoi+flxpnBEPxoER1IaAnU/NMPtT0= +github.com/klauspost/compress v1.17.10/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= @@ -126,11 +132,15 @@ github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78/go.mod h1:aL8wCCfTfS github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= go.mongodb.org/mongo-driver v1.16.1 h1:rIVLL3q0IHM39dvE+z2ulZLp9ENZKThVfuvN/IiN4l8= go.mongodb.org/mongo-driver v1.16.1/go.mod h1:oB6AhJQvFQL4LEHyXi6aJzQJtBiTQHiAd83l0GdFaiw= +go.mongodb.org/mongo-driver v1.17.0 h1:Hp4q2MCjvY19ViwimTs00wHi7G4yzxh4/2+nTx8r40k= +go.mongodb.org/mongo-driver v1.17.0/go.mod h1:wwWm/+BuOddhcq3n68LKRmgk2wXzmF6s0SFOa0GINL4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191112222119-e1110fd1c708/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.26.0 h1:RrRspgV4mU+YwB4FYnuBoKsUapNIL5cohGAmSH3azsw= golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54= +golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A= +golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= @@ -139,6 +149,8 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE= golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg= +golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo= +golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= diff --git a/oc-shared b/oc-shared index 3d43aa7..94213cf 100755 Binary files a/oc-shared and b/oc-shared differ diff --git a/routers/commentsRouter.go b/routers/commentsRouter.go index 7b4d424..dba9775 100644 --- a/routers/commentsRouter.go +++ b/routers/commentsRouter.go @@ -7,7 +7,7 @@ import ( func init() { - beego.GlobalControllerRouter["oc-shared/controllers:RuleController"] = append(beego.GlobalControllerRouter["oc-shared/controllers:RuleController"], + beego.GlobalControllerRouter["oc-shared/controllers:CollaborativeAreaController"] = append(beego.GlobalControllerRouter["oc-shared/controllers:CollaborativeAreaController"], beego.ControllerComments{ Method: "Post", Router: `/`, @@ -16,7 +16,7 @@ func init() { Filters: nil, Params: nil}) - beego.GlobalControllerRouter["oc-shared/controllers:RuleController"] = append(beego.GlobalControllerRouter["oc-shared/controllers:RuleController"], + beego.GlobalControllerRouter["oc-shared/controllers:CollaborativeAreaController"] = append(beego.GlobalControllerRouter["oc-shared/controllers:CollaborativeAreaController"], beego.ControllerComments{ Method: "GetAll", Router: `/`, @@ -25,7 +25,7 @@ func init() { Filters: nil, Params: nil}) - beego.GlobalControllerRouter["oc-shared/controllers:RuleController"] = append(beego.GlobalControllerRouter["oc-shared/controllers:RuleController"], + beego.GlobalControllerRouter["oc-shared/controllers:CollaborativeAreaController"] = append(beego.GlobalControllerRouter["oc-shared/controllers:CollaborativeAreaController"], beego.ControllerComments{ Method: "Put", Router: `/:id`, @@ -34,7 +34,7 @@ func init() { Filters: nil, Params: nil}) - beego.GlobalControllerRouter["oc-shared/controllers:RuleController"] = append(beego.GlobalControllerRouter["oc-shared/controllers:RuleController"], + beego.GlobalControllerRouter["oc-shared/controllers:CollaborativeAreaController"] = append(beego.GlobalControllerRouter["oc-shared/controllers:CollaborativeAreaController"], beego.ControllerComments{ Method: "Get", Router: `/:id`, @@ -43,7 +43,7 @@ func init() { Filters: nil, Params: nil}) - beego.GlobalControllerRouter["oc-shared/controllers:RuleController"] = append(beego.GlobalControllerRouter["oc-shared/controllers:RuleController"], + beego.GlobalControllerRouter["oc-shared/controllers:CollaborativeAreaController"] = append(beego.GlobalControllerRouter["oc-shared/controllers:CollaborativeAreaController"], beego.ControllerComments{ Method: "Delete", Router: `/:id`, @@ -52,61 +52,7 @@ func init() { Filters: nil, Params: nil}) - beego.GlobalControllerRouter["oc-shared/controllers:RuleController"] = append(beego.GlobalControllerRouter["oc-shared/controllers:RuleController"], - beego.ControllerComments{ - Method: "Search", - Router: `/search/:search`, - AllowHTTPMethods: []string{"get"}, - MethodParams: param.Make(), - Filters: nil, - Params: nil}) - - beego.GlobalControllerRouter["oc-shared/controllers:SharedWorkspaceController"] = append(beego.GlobalControllerRouter["oc-shared/controllers:SharedWorkspaceController"], - beego.ControllerComments{ - Method: "Post", - Router: `/`, - AllowHTTPMethods: []string{"post"}, - MethodParams: param.Make(), - Filters: nil, - Params: nil}) - - beego.GlobalControllerRouter["oc-shared/controllers:SharedWorkspaceController"] = append(beego.GlobalControllerRouter["oc-shared/controllers:SharedWorkspaceController"], - beego.ControllerComments{ - Method: "GetAll", - Router: `/`, - AllowHTTPMethods: []string{"get"}, - MethodParams: param.Make(), - Filters: nil, - Params: nil}) - - beego.GlobalControllerRouter["oc-shared/controllers:SharedWorkspaceController"] = append(beego.GlobalControllerRouter["oc-shared/controllers:SharedWorkspaceController"], - beego.ControllerComments{ - Method: "Put", - Router: `/:id`, - AllowHTTPMethods: []string{"put"}, - MethodParams: param.Make(), - Filters: nil, - Params: nil}) - - beego.GlobalControllerRouter["oc-shared/controllers:SharedWorkspaceController"] = append(beego.GlobalControllerRouter["oc-shared/controllers:SharedWorkspaceController"], - beego.ControllerComments{ - Method: "Get", - Router: `/:id`, - AllowHTTPMethods: []string{"get"}, - MethodParams: param.Make(), - Filters: nil, - Params: nil}) - - beego.GlobalControllerRouter["oc-shared/controllers:SharedWorkspaceController"] = append(beego.GlobalControllerRouter["oc-shared/controllers:SharedWorkspaceController"], - beego.ControllerComments{ - Method: "Delete", - Router: `/:id`, - AllowHTTPMethods: []string{"delete"}, - MethodParams: param.Make(), - Filters: nil, - Params: nil}) - - beego.GlobalControllerRouter["oc-shared/controllers:SharedWorkspaceController"] = append(beego.GlobalControllerRouter["oc-shared/controllers:SharedWorkspaceController"], + beego.GlobalControllerRouter["oc-shared/controllers:CollaborativeAreaController"] = append(beego.GlobalControllerRouter["oc-shared/controllers:CollaborativeAreaController"], beego.ControllerComments{ Method: "AddPeer", Router: `/:id/peer/:id2`, @@ -115,7 +61,7 @@ func init() { Filters: nil, Params: nil}) - beego.GlobalControllerRouter["oc-shared/controllers:SharedWorkspaceController"] = append(beego.GlobalControllerRouter["oc-shared/controllers:SharedWorkspaceController"], + beego.GlobalControllerRouter["oc-shared/controllers:CollaborativeAreaController"] = append(beego.GlobalControllerRouter["oc-shared/controllers:CollaborativeAreaController"], beego.ControllerComments{ Method: "RemovePeer", Router: `/:id/peer/:id2`, @@ -124,7 +70,7 @@ func init() { Filters: nil, Params: nil}) - beego.GlobalControllerRouter["oc-shared/controllers:SharedWorkspaceController"] = append(beego.GlobalControllerRouter["oc-shared/controllers:SharedWorkspaceController"], + beego.GlobalControllerRouter["oc-shared/controllers:CollaborativeAreaController"] = append(beego.GlobalControllerRouter["oc-shared/controllers:CollaborativeAreaController"], beego.ControllerComments{ Method: "AddRule", Router: `/:id/rule/:id2`, @@ -133,7 +79,7 @@ func init() { Filters: nil, Params: nil}) - beego.GlobalControllerRouter["oc-shared/controllers:SharedWorkspaceController"] = append(beego.GlobalControllerRouter["oc-shared/controllers:SharedWorkspaceController"], + beego.GlobalControllerRouter["oc-shared/controllers:CollaborativeAreaController"] = append(beego.GlobalControllerRouter["oc-shared/controllers:CollaborativeAreaController"], beego.ControllerComments{ Method: "RemoveRule", Router: `/:id/rule/:id2`, @@ -142,7 +88,7 @@ func init() { Filters: nil, Params: nil}) - beego.GlobalControllerRouter["oc-shared/controllers:SharedWorkspaceController"] = append(beego.GlobalControllerRouter["oc-shared/controllers:SharedWorkspaceController"], + beego.GlobalControllerRouter["oc-shared/controllers:CollaborativeAreaController"] = append(beego.GlobalControllerRouter["oc-shared/controllers:CollaborativeAreaController"], beego.ControllerComments{ Method: "RemoveWorkflow", Router: `/:id/workflow/:id2`, @@ -151,7 +97,7 @@ func init() { Filters: nil, Params: nil}) - beego.GlobalControllerRouter["oc-shared/controllers:SharedWorkspaceController"] = append(beego.GlobalControllerRouter["oc-shared/controllers:SharedWorkspaceController"], + beego.GlobalControllerRouter["oc-shared/controllers:CollaborativeAreaController"] = append(beego.GlobalControllerRouter["oc-shared/controllers:CollaborativeAreaController"], beego.ControllerComments{ Method: "AddWorkflow", Router: `/:id/workflow/:id2`, @@ -160,7 +106,7 @@ func init() { Filters: nil, Params: nil}) - beego.GlobalControllerRouter["oc-shared/controllers:SharedWorkspaceController"] = append(beego.GlobalControllerRouter["oc-shared/controllers:SharedWorkspaceController"], + beego.GlobalControllerRouter["oc-shared/controllers:CollaborativeAreaController"] = append(beego.GlobalControllerRouter["oc-shared/controllers:CollaborativeAreaController"], beego.ControllerComments{ Method: "AddWorkspace", Router: `/:id/workspace/:id2`, @@ -169,7 +115,7 @@ func init() { Filters: nil, Params: nil}) - beego.GlobalControllerRouter["oc-shared/controllers:SharedWorkspaceController"] = append(beego.GlobalControllerRouter["oc-shared/controllers:SharedWorkspaceController"], + beego.GlobalControllerRouter["oc-shared/controllers:CollaborativeAreaController"] = append(beego.GlobalControllerRouter["oc-shared/controllers:CollaborativeAreaController"], beego.ControllerComments{ Method: "RemoveWorkspace", Router: `/:id/workspace/:id2`, @@ -178,7 +124,61 @@ func init() { Filters: nil, Params: nil}) - beego.GlobalControllerRouter["oc-shared/controllers:SharedWorkspaceController"] = append(beego.GlobalControllerRouter["oc-shared/controllers:SharedWorkspaceController"], + beego.GlobalControllerRouter["oc-shared/controllers:CollaborativeAreaController"] = append(beego.GlobalControllerRouter["oc-shared/controllers:CollaborativeAreaController"], + beego.ControllerComments{ + Method: "Search", + Router: `/search/:search`, + AllowHTTPMethods: []string{"get"}, + MethodParams: param.Make(), + Filters: nil, + Params: nil}) + + beego.GlobalControllerRouter["oc-shared/controllers:RuleController"] = append(beego.GlobalControllerRouter["oc-shared/controllers:RuleController"], + beego.ControllerComments{ + Method: "Post", + Router: `/`, + AllowHTTPMethods: []string{"post"}, + MethodParams: param.Make(), + Filters: nil, + Params: nil}) + + beego.GlobalControllerRouter["oc-shared/controllers:RuleController"] = append(beego.GlobalControllerRouter["oc-shared/controllers:RuleController"], + beego.ControllerComments{ + Method: "GetAll", + Router: `/`, + AllowHTTPMethods: []string{"get"}, + MethodParams: param.Make(), + Filters: nil, + Params: nil}) + + beego.GlobalControllerRouter["oc-shared/controllers:RuleController"] = append(beego.GlobalControllerRouter["oc-shared/controllers:RuleController"], + beego.ControllerComments{ + Method: "Put", + Router: `/:id`, + AllowHTTPMethods: []string{"put"}, + MethodParams: param.Make(), + Filters: nil, + Params: nil}) + + beego.GlobalControllerRouter["oc-shared/controllers:RuleController"] = append(beego.GlobalControllerRouter["oc-shared/controllers:RuleController"], + beego.ControllerComments{ + Method: "Get", + Router: `/:id`, + AllowHTTPMethods: []string{"get"}, + MethodParams: param.Make(), + Filters: nil, + Params: nil}) + + beego.GlobalControllerRouter["oc-shared/controllers:RuleController"] = append(beego.GlobalControllerRouter["oc-shared/controllers:RuleController"], + beego.ControllerComments{ + Method: "Delete", + Router: `/:id`, + AllowHTTPMethods: []string{"delete"}, + MethodParams: param.Make(), + Filters: nil, + Params: nil}) + + beego.GlobalControllerRouter["oc-shared/controllers:RuleController"] = append(beego.GlobalControllerRouter["oc-shared/controllers:RuleController"], beego.ControllerComments{ Method: "Search", Router: `/search/:search`, diff --git a/routers/router.go b/routers/router.go index f953247..190f2ff 100644 --- a/routers/router.go +++ b/routers/router.go @@ -15,12 +15,12 @@ import ( func init() { ns := beego.NewNamespace("/oc", - beego.NSNamespace("/shared/workspace", + beego.NSNamespace("/shared/collaborative_area", beego.NSInclude( - &controllers.SharedWorkspaceController{}, + &controllers.CollaborativeAreaController{}, ), ), - beego.NSNamespace("/shared/workspace/rule", + beego.NSNamespace("/shared/collaborative_area/rule", beego.NSInclude( &controllers.RuleController{}, ), diff --git a/swagger/swagger.json b/swagger/swagger.json index cc7bbae..4d496fa 100644 --- a/swagger/swagger.json +++ b/swagger/swagger.json @@ -15,13 +15,13 @@ }, "basePath": "/oc", "paths": { - "/shared/workspace/": { + "/shared/collaborative_area/": { "get": { "tags": [ - "shared/workspace" + "shared/collaborative_area" ], "description": "find shared workspace by id\n\u003cbr\u003e", - "operationId": "SharedWorkspaceController.GetAll", + "operationId": "CollaborativeAreaController.GetAll", "responses": { "200": { "description": "{shared_workspace} models.shared_workspace" @@ -30,10 +30,10 @@ }, "post": { "tags": [ - "shared/workspace" + "shared/collaborative_area" ], "description": "create shared workspace\n\u003cbr\u003e", - "operationId": "SharedWorkspaceController.Create", + "operationId": "CollaborativeAreaController.Create", "parameters": [ { "in": "body", @@ -52,10 +52,10 @@ } } }, - "/shared/workspace/rule/": { + "/shared/collaborative_area/rule/": { "get": { "tags": [ - "shared/workspace/rule" + "shared/collaborative_area/rule" ], "description": "find rule by id\n\u003cbr\u003e", "operationId": "RuleController.GetAll", @@ -67,7 +67,7 @@ }, "post": { "tags": [ - "shared/workspace/rule" + "shared/collaborative_area/rule" ], "description": "create rule\n\u003cbr\u003e", "operationId": "RuleController.Create", @@ -89,10 +89,10 @@ } } }, - "/shared/workspace/rule/search/{search}": { + "/shared/collaborative_area/rule/search/{search}": { "get": { "tags": [ - "shared/workspace/rule" + "shared/collaborative_area/rule" ], "description": "search rule\n\u003cbr\u003e", "operationId": "RuleController.Search", @@ -112,10 +112,10 @@ } } }, - "/shared/workspace/rule/{id}": { + "/shared/collaborative_area/rule/{id}": { "get": { "tags": [ - "shared/workspace/rule" + "shared/collaborative_area/rule" ], "description": "find rule by id\n\u003cbr\u003e", "operationId": "RuleController.Get", @@ -136,7 +136,7 @@ }, "put": { "tags": [ - "shared/workspace/rule" + "shared/collaborative_area/rule" ], "description": "create rules\n\u003cbr\u003e", "operationId": "RuleController.Update", @@ -166,7 +166,7 @@ }, "delete": { "tags": [ - "shared/workspace/rule" + "shared/collaborative_area/rule" ], "description": "delete the rule\n\u003cbr\u003e", "operationId": "RuleController.Delete", @@ -186,13 +186,13 @@ } } }, - "/shared/workspace/search/{search}": { + "/shared/collaborative_area/search/{search}": { "get": { "tags": [ - "shared/workspace" + "shared/collaborative_area" ], "description": "search shared workspace\n\u003cbr\u003e", - "operationId": "SharedWorkspaceController.Search", + "operationId": "CollaborativeAreaController.Search", "parameters": [ { "in": "path", @@ -209,13 +209,13 @@ } } }, - "/shared/workspace/{id}": { + "/shared/collaborative_area/{id}": { "get": { "tags": [ - "shared/workspace" + "shared/collaborative_area" ], "description": "find shared workspace by id\n\u003cbr\u003e", - "operationId": "SharedWorkspaceController.Get", + "operationId": "CollaborativeAreaController.Get", "parameters": [ { "in": "path", @@ -233,10 +233,10 @@ }, "put": { "tags": [ - "shared/workspace" + "shared/collaborative_area" ], "description": "create shared workspaces\n\u003cbr\u003e", - "operationId": "SharedWorkspaceController.Update", + "operationId": "CollaborativeAreaController.Update", "parameters": [ { "in": "path", @@ -263,10 +263,10 @@ }, "delete": { "tags": [ - "shared/workspace" + "shared/collaborative_area" ], "description": "delete the shared workspace\n\u003cbr\u003e", - "operationId": "SharedWorkspaceController.Delete", + "operationId": "CollaborativeAreaController.Delete", "parameters": [ { "in": "path", @@ -283,13 +283,13 @@ } } }, - "/shared/workspace/{id}/peer/{id2}": { + "/shared/collaborative_area/{id}/peer/{id2}": { "post": { "tags": [ - "shared/workspace" + "shared/collaborative_area" ], "description": "find shared workspace by id\n\u003cbr\u003e", - "operationId": "SharedWorkspaceController.Add Peer", + "operationId": "CollaborativeAreaController.Add Peer", "parameters": [ { "in": "path", @@ -314,10 +314,10 @@ }, "delete": { "tags": [ - "shared/workspace" + "shared/collaborative_area" ], "description": "find shared workspace by id\n\u003cbr\u003e", - "operationId": "SharedWorkspaceController.Remove Peer", + "operationId": "CollaborativeAreaController.Remove Peer", "parameters": [ { "in": "path", @@ -341,13 +341,13 @@ } } }, - "/shared/workspace/{id}/rule/{id2}": { + "/shared/collaborative_area/{id}/rule/{id2}": { "post": { "tags": [ - "shared/workspace" + "shared/collaborative_area" ], "description": "find shared workspace by id\n\u003cbr\u003e", - "operationId": "SharedWorkspaceController.Add Rule", + "operationId": "CollaborativeAreaController.Add Rule", "parameters": [ { "in": "path", @@ -372,10 +372,10 @@ }, "delete": { "tags": [ - "shared/workspace" + "shared/collaborative_area" ], "description": "find shared workspace by id\n\u003cbr\u003e", - "operationId": "SharedWorkspaceController.Remove Rule", + "operationId": "CollaborativeAreaController.Remove Rule", "parameters": [ { "in": "path", @@ -399,13 +399,13 @@ } } }, - "/shared/workspace/{id}/workflow/{id2}": { + "/shared/collaborative_area/{id}/workflow/{id2}": { "post": { "tags": [ - "shared/workspace" + "shared/collaborative_area" ], "description": "find shared workspace by id\n\u003cbr\u003e", - "operationId": "SharedWorkspaceController.Add Workflow", + "operationId": "CollaborativeAreaController.Add Workflow", "parameters": [ { "in": "path", @@ -430,10 +430,10 @@ }, "delete": { "tags": [ - "shared/workspace" + "shared/collaborative_area" ], "description": "find shared workspace by id\n\u003cbr\u003e", - "operationId": "SharedWorkspaceController.Remove Workflow", + "operationId": "CollaborativeAreaController.Remove Workflow", "parameters": [ { "in": "path", @@ -457,13 +457,13 @@ } } }, - "/shared/workspace/{id}/workspace/{id2}": { + "/shared/collaborative_area/{id}/workspace/{id2}": { "post": { "tags": [ - "shared/workspace" + "shared/collaborative_area" ], "description": "find shared workspace by id\n\u003cbr\u003e", - "operationId": "SharedWorkspaceController.Add Workspace", + "operationId": "CollaborativeAreaController.Add Workspace", "parameters": [ { "in": "path", @@ -488,10 +488,10 @@ }, "delete": { "tags": [ - "shared/workspace" + "shared/collaborative_area" ], "description": "find shared workspace by id\n\u003cbr\u003e", - "operationId": "SharedWorkspaceController.Add Workspace", + "operationId": "CollaborativeAreaController.Add Workspace", "parameters": [ { "in": "path", @@ -560,11 +560,11 @@ }, "tags": [ { - "name": "shared/workspace", + "name": "shared/collaborative_area", "description": "Operations about workspace\n" }, { - "name": "shared/workspace/rule", + "name": "shared/collaborative_area/rule", "description": "Operations about rule\n" }, { diff --git a/swagger/swagger.yml b/swagger/swagger.yml index bcaf9d2..1671d9a 100644 --- a/swagger/swagger.yml +++ b/swagger/swagger.yml @@ -12,24 +12,24 @@ info: url: https://opensource.org/license/mit basePath: /oc paths: - /shared/workspace/: + /shared/collaborative_area/: get: tags: - - shared/workspace + - shared/collaborative_area description: |- find shared workspace by id
- operationId: SharedWorkspaceController.GetAll + operationId: CollaborativeAreaController.GetAll responses: "200": description: '{shared_workspace} models.shared_workspace' post: tags: - - shared/workspace + - shared/collaborative_area description: |- create shared workspace
- operationId: SharedWorkspaceController.Create + operationId: CollaborativeAreaController.Create parameters: - in: body name: data @@ -40,14 +40,14 @@ paths: responses: "200": description: '{shared workspace} models.shared_workspace' - /shared/workspace/{id}: + /shared/collaborative_area/{id}: get: tags: - - shared/workspace + - shared/collaborative_area description: |- find shared workspace by id
- operationId: SharedWorkspaceController.Get + operationId: CollaborativeAreaController.Get parameters: - in: path name: id @@ -59,11 +59,11 @@ paths: description: '{shared workspace} models.shared_workspace' put: tags: - - shared/workspace + - shared/collaborative_area description: |- create shared workspaces
- operationId: SharedWorkspaceController.Update + operationId: CollaborativeAreaController.Update parameters: - in: path name: id @@ -81,11 +81,11 @@ paths: description: '{shared workspace} models.shared_workspace' delete: tags: - - shared/workspace + - shared/collaborative_area description: |- delete the shared workspace
- operationId: SharedWorkspaceController.Delete + operationId: CollaborativeAreaController.Delete parameters: - in: path name: id @@ -95,14 +95,14 @@ paths: responses: "200": description: '{shared workspace} delete success!' - /shared/workspace/{id}/peer/{id2}: + /shared/collaborative_area/{id}/peer/{id2}: post: tags: - - shared/workspace + - shared/collaborative_area description: |- find shared workspace by id
- operationId: SharedWorkspaceController.Add Peer + operationId: CollaborativeAreaController.Add Peer parameters: - in: path name: id @@ -119,11 +119,11 @@ paths: description: '{shared workspace} models.shared_workspace' delete: tags: - - shared/workspace + - shared/collaborative_area description: |- find shared workspace by id
- operationId: SharedWorkspaceController.Remove Peer + operationId: CollaborativeAreaController.Remove Peer parameters: - in: path name: id @@ -138,14 +138,14 @@ paths: responses: "200": description: '{shared workspace} models.shared_workspace' - /shared/workspace/{id}/rule/{id2}: + /shared/collaborative_area/{id}/rule/{id2}: post: tags: - - shared/workspace + - shared/collaborative_area description: |- find shared workspace by id
- operationId: SharedWorkspaceController.Add Rule + operationId: CollaborativeAreaController.Add Rule parameters: - in: path name: id @@ -162,11 +162,11 @@ paths: description: '{shared workspace} models.shared_workspace' delete: tags: - - shared/workspace + - shared/collaborative_area description: |- find shared workspace by id
- operationId: SharedWorkspaceController.Remove Rule + operationId: CollaborativeAreaController.Remove Rule parameters: - in: path name: id @@ -181,14 +181,14 @@ paths: responses: "200": description: '{shared workspace} models.shared_workspace' - /shared/workspace/{id}/workflow/{id2}: + /shared/collaborative_area/{id}/workflow/{id2}: post: tags: - - shared/workspace + - shared/collaborative_area description: |- find shared workspace by id
- operationId: SharedWorkspaceController.Add Workflow + operationId: CollaborativeAreaController.Add Workflow parameters: - in: path name: id @@ -205,11 +205,11 @@ paths: description: '{shared workspace} models.shared_workspace' delete: tags: - - shared/workspace + - shared/collaborative_area description: |- find shared workspace by id
- operationId: SharedWorkspaceController.Remove Workflow + operationId: CollaborativeAreaController.Remove Workflow parameters: - in: path name: id @@ -224,14 +224,14 @@ paths: responses: "200": description: '{shared workspace} models.shared_workspace' - /shared/workspace/{id}/workspace/{id2}: + /shared/collaborative_area/{id}/workspace/{id2}: post: tags: - - shared/workspace + - shared/collaborative_area description: |- find shared workspace by id
- operationId: SharedWorkspaceController.Add Workspace + operationId: CollaborativeAreaController.Add Workspace parameters: - in: path name: id @@ -248,11 +248,11 @@ paths: description: '{shared workspace} models.shared_workspace' delete: tags: - - shared/workspace + - shared/collaborative_area description: |- find shared workspace by id
- operationId: SharedWorkspaceController.Add Workspace + operationId: CollaborativeAreaController.Add Workspace parameters: - in: path name: id @@ -267,10 +267,10 @@ paths: responses: "200": description: '{shared workspace} models.shared_workspace' - /shared/workspace/rule/: + /shared/collaborative_area/rule/: get: tags: - - shared/workspace/rule + - shared/collaborative_area/rule description: |- find rule by id
@@ -280,7 +280,7 @@ paths: description: '{rule} models.rule' post: tags: - - shared/workspace/rule + - shared/collaborative_area/rule description: |- create rule
@@ -295,10 +295,10 @@ paths: responses: "200": description: '{rule} models.rule' - /shared/workspace/rule/{id}: + /shared/collaborative_area/rule/{id}: get: tags: - - shared/workspace/rule + - shared/collaborative_area/rule description: |- find rule by id
@@ -314,7 +314,7 @@ paths: description: '{rule} models.rule' put: tags: - - shared/workspace/rule + - shared/collaborative_area/rule description: |- create rules
@@ -336,7 +336,7 @@ paths: description: '{rule} models.rule' delete: tags: - - shared/workspace/rule + - shared/collaborative_area/rule description: |- delete the rule
@@ -350,10 +350,10 @@ paths: responses: "200": description: '{rule} delete success!' - /shared/workspace/rule/search/{search}: + /shared/collaborative_area/rule/search/{search}: get: tags: - - shared/workspace/rule + - shared/collaborative_area/rule description: |- search rule
@@ -367,14 +367,14 @@ paths: responses: "200": description: '{rule} models.rule' - /shared/workspace/search/{search}: + /shared/collaborative_area/search/{search}: get: tags: - - shared/workspace + - shared/collaborative_area description: |- search shared workspace
- operationId: SharedWorkspaceController.Search + operationId: CollaborativeAreaController.Search parameters: - in: path name: search @@ -417,10 +417,10 @@ definitions: title: workspace type: object tags: -- name: shared/workspace +- name: shared/collaborative_area description: | Operations about workspace -- name: shared/workspace/rule +- name: shared/collaborative_area/rule description: | Operations about rule - name: version