clear go.sum

Merge branch 'feature/payment' into main
oc-lib
2025-02-13 10:11:58 +01:00 · 2025-02-13 10:09:29 +01:00 · 2025-02-06 08:51:41 +01:00 · 2025-02-05 08:37:53 +01:00 · 2025-01-17 17:19:44 +01:00
6 changed files with 56 additions and 19 deletions
--- a/controllers/workflow.go
+++ b/controllers/workflow.go
@ -32,12 +32,15 @@ var paths = map[tools.DataType]map[tools.METHOD]string{ // paths to call other O
 // @Title Search
 // @Description search workspace
 // @Param	search		path 	string	true		"the word search you want to get"
+// @Param	is_draft	query 	string	false		"draft wished"
 // @Success 200 {workspace} models.workspace
 // @router /search/:search [get]
 func (o *WorkflowController) Search() {
+	user, peerID, groups := oclib.ExtractTokenInfo(*o.Ctx.Request)
 	// store and return Id or post with UUID
 	search := o.Ctx.Input.Param(":search")
-	o.Data["json"] = oclib.Search(nil, search, oclib.LibDataEnum(oclib.WORKFLOW))
+	isDraft := o.Ctx.Input.Query("is_draft")
+	o.Data["json"] = oclib.NewRequest(oclib.LibDataEnum(oclib.WORKFLOW), user, peerID, groups, nil).Search(nil, search, isDraft == "true")
 	o.ServeJSON()
 }

@ -48,14 +51,16 @@ func (o *WorkflowController) Search() {
 // @Success 200 {object} models.workflow
 // @router /:id [put]
 func (o *WorkflowController) Put() {
+	user, peerID, groups := oclib.ExtractTokenInfo(*o.Ctx.Request)
 	// store and return Id or post with UUID
 	var res map[string]interface{}
 	id := o.Ctx.Input.Param(":id")
 	json.Unmarshal(o.Ctx.Input.CopyBody(10000000), &res)
+	fmt.Println("res", res["links"])
 	caller := tools.NewHTTPCaller(paths) // create a new HTTP caller
 	caller.Disabled = oclib.IsQueryParamsEquals(o.Ctx.Input, "is_remote", true)
 	o.Ctx.Input.Param("is_remote")
-	data := oclib.UpdateOne(oclib.LibDataEnum(oclib.WORKFLOW), res, id, caller)
+	data := oclib.NewRequest(oclib.LibDataEnum(oclib.WORKFLOW), user, peerID, groups, caller).UpdateOne(res, id)
 	o.Data["json"] = data
 	o.ServeJSON()
 }
@ -66,12 +71,12 @@ func (o *WorkflowController) Put() {
 // @Success 200 {object} models.workflow
 // @router / [post]
 func (o *WorkflowController) Post() {
-
+	user, peerID, groups := oclib.ExtractTokenInfo(*o.Ctx.Request)
 	var res map[string]interface{}
 	json.Unmarshal(o.Ctx.Input.CopyBody(10000000), &res)
 	caller := tools.NewHTTPCaller(paths) // create a new HTTP caller
 	caller.Disabled = oclib.IsQueryParamsEquals(o.Ctx.Input, "is_remote", true)
-	data := oclib.StoreOne(oclib.LibDataEnum(oclib.WORKFLOW), res, caller)
+	data := oclib.NewRequest(oclib.LibDataEnum(oclib.WORKFLOW), user, peerID, groups, caller).StoreOne(res)
 	o.Data["json"] = data
 	o.ServeJSON()
 }
@ -82,10 +87,11 @@ func (o *WorkflowController) Post() {
 // @Success 200 {object} models.workflow
 // @router /publish/:id [post]
 func (o *WorkflowController) Publish() {
+	user, peerID, groups := oclib.ExtractTokenInfo(*o.Ctx.Request)
 	id := o.Ctx.Input.Param(":id")
-	data := oclib.LoadOne(oclib.LibDataEnum(oclib.WORKFLOW), id)
+	data := oclib.NewRequest(oclib.LibDataEnum(oclib.WORKFLOW), user, peerID, groups, nil).LoadOne(id)
 	if data.Data != nil { // copy existing workflow as a resource
-		o.Data["json"] = oclib.CopyOne(oclib.LibDataEnum(oclib.WORKFLOW_RESOURCE), data.Data.Serialize())
+		o.Data["json"] = oclib.NewRequest(oclib.LibDataEnum(oclib.WORKFLOW), user, peerID, groups, nil).CopyOne(data.Data.Serialize(data.Data))
 	} else {
 		o.Data["json"] = data
 	}
@ -94,10 +100,13 @@ func (o *WorkflowController) Publish() {

 // @Title GetAll
 // @Description find workflow by workflowid
+// @Param	is_draft	query 	string	false		"draft wished"
 // @Success 200 {workflow} models.workflow
 // @router / [get]
 func (o *WorkflowController) GetAll() {
-	o.Data["json"] = oclib.LoadAll(oclib.LibDataEnum(oclib.WORKFLOW))
+	user, peerID, groups := oclib.ExtractTokenInfo(*o.Ctx.Request)
+	isDraft := o.Ctx.Input.Query("is_draft")
+	o.Data["json"] = oclib.NewRequest(oclib.LibDataEnum(oclib.WORKFLOW), user, peerID, groups, nil).LoadAll(isDraft == "true")
 	o.ServeJSON()
 }

@ -107,10 +116,11 @@ func (o *WorkflowController) GetAll() {
 // @Success 200 {workflow} models.workflow
 // @router /:id [get]
 func (o *WorkflowController) Get() {
+	user, peerID, groups := oclib.ExtractTokenInfo(*o.Ctx.Request)
 	id := o.Ctx.Input.Param(":id")
 	caller := tools.NewHTTPCaller(paths) // create a new HTTP caller
 	caller.Disabled = oclib.IsQueryParamsEquals(o.Ctx.Input, "is_remote", true)
-	o.Data["json"] = oclib.LoadOne(oclib.LibDataEnum(oclib.WORKFLOW), id, caller)
+	o.Data["json"] = oclib.NewRequest(oclib.LibDataEnum(oclib.WORKFLOW), user, peerID, groups, caller).LoadOne(id)
 	o.ServeJSON()
 }

@ -120,10 +130,11 @@ func (o *WorkflowController) Get() {
 // @Success 200 {string} delete success!
 // @router /:id [delete]
 func (o *WorkflowController) Delete() {
+	user, peerID, groups := oclib.ExtractTokenInfo(*o.Ctx.Request)
 	id := o.Ctx.Input.Param(":id")
 	caller := tools.NewHTTPCaller(paths) // create a new HTTP caller
 	caller.Disabled = oclib.IsQueryParamsEquals(o.Ctx.Input, "is_remote", true)
-	o.Data["json"] = oclib.DeleteOne(oclib.LibDataEnum(oclib.WORKFLOW), id, caller)
+	o.Data["json"] = oclib.NewRequest(oclib.LibDataEnum(oclib.WORKFLOW), user, peerID, groups, caller).DeleteOne(id)
 	o.ServeJSON()
 }

@ -149,8 +160,9 @@ func (o *WorkflowController) Check() {
 			"error": errors.New("invalid date format"),
 		}
 	} else {
-		res := oclib.LoadOne(oclib.LibDataEnum(oclib.WORKFLOW), id)
-		if res.Code == 200 {
+		user, peerID, groups := oclib.ExtractTokenInfo(*o.Ctx.Request)
+		res := oclib.NewRequest(oclib.LibDataEnum(oclib.WORKFLOW), user, peerID, groups, nil).LoadOne(id)
+		if res.Data != nil {
 			workflow := res.ToWorkflow()
 			caller := tools.NewHTTPCaller(map[tools.DataType]map[tools.METHOD]string{ // paths to call other OC services
 				tools.PEER: {
@ -161,7 +173,7 @@ func (o *WorkflowController) Check() {
 				},
 			})
 			isAvailable, err := workflow.CheckBooking(caller) // check booking
-			fmt.Println("isAvailable", isAvailable, o.Ctx.Input.Param(":start_date"), o.Ctx.Input.Param(":end_date"))
+			fmt.Println("isAvailable", isAvailable, o.Ctx.Input.Param(":start_date"), o.Ctx.Input.Param(":end_date"), err)
 			code := 200
 			if !isAvailable { // if not available then its a conflict
 				code = 409
@ -176,7 +188,6 @@ func (o *WorkflowController) Check() {
 		} else {
 			o.Data["json"] = res
 		}
-
 	}
 	o.ServeJSON()
 }
--- 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-20250108155542-0f4adeea86be
+	cloud.o-forge.io/core/oc-lib v0.0.0-20250205160221-88b7cfe2fd0f
 	github.com/beego/beego/v2 v2.3.1
 	github.com/nats-io/nats.go v1.37.0
 	github.com/smartystreets/goconvey v1.7.2
@ -13,6 +13,7 @@ require (

 require (
 	github.com/beorn7/perks v1.0.1 // indirect
+	github.com/biter777/countries v1.7.5 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/gabriel-vasile/mimetype v1.4.6 // indirect
@ -40,7 +41,7 @@ require (
 	github.com/prometheus/client_model v0.6.1 // indirect
 	github.com/prometheus/common v0.60.1 // indirect
 	github.com/prometheus/procfs v0.15.1 // indirect
-	github.com/robfig/cron/v3 v3.0.1 // indirect
+	github.com/robfig/cron v1.2.0 // indirect
 	github.com/rogpeppe/go-internal v1.11.0 // indirect
 	github.com/rs/zerolog v1.33.0 // indirect
 	github.com/shiena/ansicolor v0.0.0-20230509054315-a9deabde6e02 // indirect
--- a/go.sum
+++ b/go.sum
@ -1,10 +1,12 @@
-cloud.o-forge.io/core/oc-lib v0.0.0-20250108155542-0f4adeea86be h1:1Yf8ihUxXjOEPqcfgtXJpJ/slxBUHhf7AgS7DZI3iUk=
-cloud.o-forge.io/core/oc-lib v0.0.0-20250108155542-0f4adeea86be/go.mod h1:ya7Q+zHhaKM+XF6sAJ+avqHEVzaMnFJQih2X3TlTlGo=
+cloud.o-forge.io/core/oc-lib v0.0.0-20250205160221-88b7cfe2fd0f h1:6V+Z81ywYoDYSVMnM4PVaJYXFgCN3xSG3ddiUPn4jL8=
+cloud.o-forge.io/core/oc-lib v0.0.0-20250205160221-88b7cfe2fd0f/go.mod h1:2roQbUpv3a6mTIr5oU1ux31WbN8YucyyQvCQ0FqwbcE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/beego/beego/v2 v2.3.1 h1:7MUKMpJYzOXtCUsTEoXOxsDV/UcHw6CPbaWMlthVNsc=
 github.com/beego/beego/v2 v2.3.1/go.mod h1:5cqHsOHJIxkq44tBpRvtDe59GuVRVv/9/tyVDxd5ce4=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
+github.com/biter777/countries v1.7.5 h1:MJ+n3+rSxWQdqVJU8eBy9RqcdH6ePPn4PJHocVWUa+Q=
+github.com/biter777/countries v1.7.5/go.mod h1:1HSpZ526mYqKJcpT5Ti1kcGQ0L0SrXWIaptUWjFfv2E=
 github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
 github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/coreos/etcd v3.3.17+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
@ -95,8 +97,8 @@ github.com/prometheus/common v0.60.1 h1:FUas6GcOw66yB/73KC+BOZoFJmbo/1pojoILArPA
 github.com/prometheus/common v0.60.1/go.mod h1:h0LYf1R1deLSKtD4Vdg8gy4RuOvENW2J/h19V5NADQw=
 github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc=
 github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk=
-github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
-github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
+github.com/robfig/cron v1.2.0 h1:ZjScXvvxeQ63Dbyxy76Fj3AT3Ut0aKsyd2/tl3DTMuQ=
+github.com/robfig/cron v1.2.0/go.mod h1:JGuDeoQd7Z6yL4zQhZ3OPEVHB7fL6Ka6skscFHfmt2k=
 github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
 github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
 github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
--- a/BIN
+++ b/BIN
--- a/swagger/swagger.json
+++ b/swagger/swagger.json
@ -22,6 +22,14 @@
                ],
                "description": "find workflow by workflowid\n\u003cbr\u003e",
                "operationId": "WorkflowController.GetAll",
+                "parameters": [
+                    {
+                        "in": "query",
+                        "name": "is_draft",
+                        "description": "draft wished",
+                        "type": "string"
+                    }
+                ],
                "responses": {
                    "200": {
                        "description": "{workflow} models.workflow"
@ -133,6 +141,12 @@
                        "description": "the word search you want to get",
                        "required": true,
                        "type": "string"
+                    },
+                    {
+                        "in": "query",
+                        "name": "is_draft",
+                        "description": "draft wished",
+                        "type": "string"
                    }
                ],
                "responses": {
--- a/swagger/swagger.yml
+++ b/swagger/swagger.yml
@ -20,6 +20,11 @@ paths:
        find workflow by workflowid
        <br>
      operationId: WorkflowController.GetAll
+      parameters:
+      - in: query
+        name: is_draft
+        description: draft wished
+        type: string
      responses:
        "200":
          description: '{workflow} models.workflow'
@ -159,6 +164,10 @@ paths:
        description: the word search you want to get
        required: true
        type: string
+      - in: query
+        name: is_draft
+        description: draft wished
+        type: string
      responses:
        "200":
          description: '{workspace} models.workspace'
Author	SHA1	Message	Date
mr	410058cac8	clear go.sum	2025-02-13 10:11:58 +01:00
mr	0c07163ebc	Merge branch 'feature/payment' into main	2025-02-13 10:09:29 +01:00
mr	c7c461e516	oc-lib	2025-02-06 08:51:41 +01:00
mr	3056f9ca4a	neo oc-lib	2025-02-05 08:37:53 +01:00
mr	44aac7c532	workin oc-workflow	2025-01-17 17:19:44 +01:00