adjustment

dev launch mode
2025-03-28 08:47:20 +01:00 · 2025-03-28 08:46:50 +01:00 · 2025-03-06 09:33:16 +01:00 · 2025-02-21 11:19:34 +01:00 · 2025-02-19 12:04:57 +01:00 · 2025-02-18 15:03:25 +01:00
20 changed files with 481 additions and 211 deletions
--- a/46
+++ b/46
@@ -1,30 +1,46 @@
+FROM golang:alpine AS deps
+
+WORKDIR /app
+COPY go.mod go.sum ./
+RUN sed -i '/replace/d' go.mod
+RUN go mod download
+
+#----------------------------------------------------------------------------------------------
+
 FROM golang:alpine AS builder

 WORKDIR /app 

-COPY . .
-
 RUN apk add git

-RUN go get github.com/beego/bee/v2 && go install github.com/beego/bee/v2@master
+RUN go install github.com/beego/bee/v2@latest

-RUN timeout 15 bee run -gendoc=true -downdoc=true -runmode=dev || :
+WORKDIR /oc-peer

-RUN sed -i 's/http:\/\/127.0.0.1:8080\/swagger\/swagger.json/swagger.json/g' swagger/index.html
+COPY --from=deps /go/pkg /go/pkg
+COPY --from=deps /app/go.mod /app/go.sum ./

-RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="-w -s" -o setup .
+RUN export CGO_ENABLED=0 && \
+    export GOOS=linux && \
+    export GOARCH=amd64 && \
+    export BUILD_FLAGS="-ldflags='-w -s'"

-RUN ls /app
+COPY . .

-FROM scratch
+RUN sed -i '/replace/d' go.mod
+RUN bee pack
+RUN mkdir -p /app/extracted && tar -zxvf oc-peer.tar.gz -C /app/extracted
+RUN sed -i 's/http:\/\/127.0.0.1:8080\/swagger\/swagger.json/swagger.json/g' /app/extracted/swagger/index.html
+
+#----------------------------------------------------------------------------------------------
+
+FROM golang:alpine

 WORKDIR /app
+COPY --from=builder /app/extracted/oc-peer /usr/bin/ 
+COPY --from=builder /app/extracted/swagger /app/swagger
+COPY --from=builder /app/extracted/docker_conf.json /etc/oc/peer.json

-COPY --from=builder /app/setup /usr/bin/ 
-COPY --from=builder /app/swagger /app/swagger
+EXPOSE 8080

-COPY docker_conf.json /etc/oc/conf.json
-
-EXPOSE $PORT
-
-ENTRYPOINT ["setup"]
+ENTRYPOINT ["oc-peer"]
--- a/35
+++ b/35
@@ -0,0 +1,35 @@
+.DEFAULT_GOAL := all
+
+build: clean
+	bee pack
+
+run:
+	bee run -gendoc=true -downdoc=true
+
+purge:
+	lsof -t -i:8093 | xargs kill | true
+
+run-dev:
+	bee generate routers && bee run -gendoc=true -downdoc=true -runmode=prod
+
+dev: purge run-dev
+
+debug:
+	bee run -downdebug -gendebug
+
+clean:
+	rm -rf oc-peer.tar.gz
+
+docker:
+	DOCKER_BUILDKIT=1 docker build -t oc/oc-peer:0.0.1 -f Dockerfile .
+	docker tag oc/oc-peer:0.0.1 oc/oc-peer:latest
+
+publish-kind:
+	kind load docker-image oc/oc-peer:0.0.1 --name opencloud
+
+publish-registry:
+	@echo "TODO"
+
+all: docker publish-kind publish-registry
+
+.PHONY: build run clean docker publish-kind publish-registry
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# oc-peers OpenCloud scheduler service.
+# oc-peer OpenCloud scheduler service.

 Manages user schedulers 

@@ -6,6 +6,8 @@ To build :

    bee generate routers
    bee run -gendoc=true -downdoc=true
+OR
+    make dev

 If default Swagger page is displayed instead of tyour api, change url in swagger/index.html file to :

--- a/conf/app.conf
+++ b/conf/app.conf
@@ -1,5 +1,5 @@
-appname = oc-peers
-httpport = 8080
+appname = oc-peer
+httpport = 8093
 runmode = dev
 autorender = false
 copyrequestbody = true
--- a/controllers/peer.go
+++ b/controllers/peer.go
@@ -4,6 +4,7 @@ import (
 	"encoding/json"

 	oclib "cloud.o-forge.io/core/oc-lib"
+	"cloud.o-forge.io/core/oc-lib/models/peer"
 	beego "github.com/beego/beego/v2/server/web"
 )

@@ -15,12 +16,15 @@ type PeerController struct {
 // @Title Search
 // @Description search workspace
 // @Param	search		path 	string	true		"the word search you want to get"
+// @Param  is_draft       query  string  false
 // @Success 200 {workspace} models.workspace
 // @router /search/:search [get]
 func (o *PeerController) Search() {
-	// store and return Id or post with UUID
+	user, peerID, groups := oclib.ExtractTokenInfo(*o.Ctx.Request)
+	// store and return Id or post with UUIDLibDataEnum
 	search := o.Ctx.Input.Param(":search")
-	o.Data["json"] = oclib.Search(nil, search, oclib.LibDataEnum(oclib.PEER))
+	isDraft := o.Ctx.Input.Query("is_draft")
+	o.Data["json"] = oclib.NewRequest(oclib.LibDataEnum(oclib.PEER), user, peerID, groups, nil).Search(nil, search, isDraft == "true")
 	o.ServeJSON()
 }

@@ -32,20 +36,24 @@ func (o *PeerController) Search() {
 // @router /:id [put]
 func (o *PeerController) Put() {
 	// store and return Id or post with UUID
+	user, peerID, groups := oclib.ExtractTokenInfo(*o.Ctx.Request)
 	var res map[string]interface{}
 	id := o.Ctx.Input.Param(":id")
 	json.Unmarshal(o.Ctx.Input.CopyBody(10000), &res)
-	data := oclib.UpdateOne(oclib.LibDataEnum(oclib.PEER), res, id, nil)
+	data := oclib.NewRequest(oclib.LibDataEnum(oclib.PEER), user, peerID, groups, nil).UpdateOne(res, id)
 	o.Data["json"] = data
 	o.ServeJSON()
 }

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

@@ -55,7 +63,50 @@ func (o *PeerController) GetAll() {
 // @Success 200 {peer} models.peer
 // @router /:id [get]
 func (o *PeerController) Get() {
+	user, peerID, groups := oclib.ExtractTokenInfo(*o.Ctx.Request)
 	id := o.Ctx.Input.Param(":id")
-	o.Data["json"] = oclib.LoadOne(oclib.LibDataEnum(oclib.PEER), id)
+	o.Data["json"] = oclib.NewRequest(oclib.LibDataEnum(oclib.PEER), user, peerID, groups, nil).LoadOne(id)
+	o.ServeJSON()
+}
+
+// @Title Partner
+// @Description add partner peer by peerid
+// @Param	id		path 	string	true		"the peer id you want to partner"
+// @Success 200 {peer} models.peer
+// @router /:id/partner [post]
+func (o *PeerController) Partner() {
+	user, peerID, groups := oclib.ExtractTokenInfo(*o.Ctx.Request)
+	id := o.Ctx.Input.Param(":id")
+	o.Data["json"] = oclib.NewRequest(oclib.LibDataEnum(oclib.PEER), user, peerID, groups, nil).UpdateOne(map[string]interface{}{
+		"state": peer.PARTNER,
+	}, id)
+	o.ServeJSON()
+}
+
+// @Title Blacklist
+// @Description add blacklist peer by peerid
+// @Param	id		path 	string	true		"the peer id you want to blacklist"
+// @Success 200 {peer} models.peer
+// @router /:id/blacklist [post]
+func (o *PeerController) Blacklist() {
+	user, peerID, groups := oclib.ExtractTokenInfo(*o.Ctx.Request)
+	id := o.Ctx.Input.Param(":id")
+	o.Data["json"] = oclib.NewRequest(oclib.LibDataEnum(oclib.PEER), user, peerID, groups, nil).UpdateOne(map[string]interface{}{
+		"state": peer.BLACKLIST,
+	}, id)
+	o.ServeJSON()
+}
+
+// @Title DeleteState
+// @Description delete state peer by peerid
+// @Param	id		path 	string	true		"the peer id you want to delete state"
+// @Success 200 {peer} models.peer
+// @router /:id/undo_state [post]
+func (o *PeerController) DeleteState() {
+	user, peerID, groups := oclib.ExtractTokenInfo(*o.Ctx.Request)
+	id := o.Ctx.Input.Param(":id")
+	o.Data["json"] = oclib.NewRequest(oclib.LibDataEnum(oclib.PEER), user, peerID, groups, nil).UpdateOne(map[string]interface{}{
+		"state": peer.NONE,
+	}, id)
 	o.ServeJSON()
 }
--- a/controllers/status.go
+++ b/controllers/status.go
@@ -33,13 +33,9 @@ type StatusController struct {
 func (o *StatusController) Status() {
 	var address map[string]string
 	json.Unmarshal(o.Ctx.Input.CopyBody(10000), &address)
-	if len(address) == 0 { // default if nothing is send in body
-		for _, host := range []string{"oc-datacenter", "oc-workflow", "oc-workspace", "oc-shared", "oc-workspace"} {
-			address[host] = "http://" + host + ":8080/oc"
-		}
-	}
 	api := tools.API{}
-	state, services, err := api.CheckRemoteAPIs(address) // check if the services are alive
+	state, services, err := api.CheckRemoteAPIs([]tools.DataType{tools.BOOKING, tools.WORKFLOW, tools.WORKSPACE,
+		tools.COLLABORATIVE_AREA, tools.DATA_RESOURCE}) // check if the services are alive
 	errSTR := ""
 	if err != nil {
 		errSTR = err.Error()
--- a/controllers/version.go
+++ b/controllers/version.go
@@ -14,6 +14,9 @@ type VersionController struct {
 // @Success 200
 // @router / [get]
 func (c *VersionController) GetAll() {
-	c.Data["json"] = map[string]string{"version": "1"}
+	c.Data["json"] = map[string]string{
+		"service": "oc-peer",
+		"version": "1",
+	}
 	c.ServeJSON()
 }
--- a/docker-compose.base.yml
+++ b/docker-compose.base.yml
@@ -1,33 +0,0 @@
-version: '3.4'
-
-services:
-  mongo:
-    image: 'mongo:latest'
-    networks: 
-      - catalog
-    ports:
-      - 27017:27017
-    container_name: mongo
-    volumes: 
-      - oc-catalog-data:/data/db
-      - oc-catalog-data:/data/configdb
-  
-  mongo-express:
-    image: "mongo-express:latest"
-    restart: always
-    depends_on: 
-      - mongo
-    networks: 
-      - catalog
-    ports:
-      - 8081:8081
-    environment:
-      - ME_CONFIG_BASICAUTH_USERNAME=test
-      - ME_CONFIG_BASICAUTH_PASSWORD=test
-
-volumes:
-  oc-catalog-data:
-
-networks: 
-  catalog:
-    # name: catalog
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,16 +1,25 @@
 version: '3.4'

 services:
-  oc-peers:
+  oc-peer:
    environment: 
      - MONGO_DATABASE=DC_myDC
-    image: 'oc-peers:latest'
+    image: 'oc-peer:latest'
+    labels:
+        - "traefik.enable=true"
+        - "traefik.http.routers.peer.entrypoints=web"
+        - "traefik.http.routers.peer.rule=PathPrefix(`/peer`)"
+        - "traefik.http.middlewares.peer-rewrite.replacepathregex.regex=^/peer(.*)"
+        - "traefik.http.middlewares.peer-rewrite.replacepathregex.replacement=/oc$$1"
+        - "traefik.http.routers.peer.middlewares=peer-rewrite"
+        - "traefik.http.services.peer.loadbalancer.server.port=8080"
+        - "traefik.http.middlewares.peer.forwardauth.address=http://oc-auth:8080/oc/forward"
    ports:
      - 8093:8080
-    container_name: oc-peers
+    container_name: oc-peer
    networks: 
-      - catalog
+      - oc

 networks: 
-  catalog:
+  oc:
    external: true
--- a/docker_conf.json
+++ b/docker_conf.json
@@ -1,7 +1,5 @@
 {
    "MONGO_URL":"mongodb://mongo:27017/", 
    "MONGO_DATABASE":"DC_myDC",
-    "NATS_URL": "nats://nats:4222",
-    "HOSTNAME": "oc-peers",
-    "PORT" : 8080
+    "NATS_URL": "nats://nats:4222"
 }
--- a/go.mod
+++ b/go.mod
@@ -1,20 +1,21 @@
-module oc-peers
+module oc-peer

 go 1.22.0

 toolchain go1.22.4

 require (
-	cloud.o-forge.io/core/oc-lib v0.0.0-20241002120813-a09a04e1a71e
+	cloud.o-forge.io/core/oc-lib v0.0.0-20250219142942-5111c9c8bec7
 	github.com/beego/beego/v2 v2.3.1
 	github.com/smartystreets/goconvey v1.7.2
 )

 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.5 // indirect
+	github.com/gabriel-vasile/mimetype v1.4.6 // 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.1 // indirect
@@ -24,7 +25,7 @@ require (
 	github.com/goraz/onion v0.1.3 // indirect
 	github.com/hashicorp/golang-lru v1.0.2 // indirect
 	github.com/jtolds/gls v4.20.0+incompatible // indirect
-	github.com/klauspost/compress v1.17.10 // indirect
+	github.com/klauspost/compress v1.17.11 // 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
@@ -36,11 +37,11 @@ require (
 	github.com/nats-io/nkeys v0.4.7 // indirect
 	github.com/nats-io/nuid v1.0.1 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
-	github.com/prometheus/client_golang v1.20.2 // indirect
+	github.com/prometheus/client_golang v1.20.5 // indirect
 	github.com/prometheus/client_model v0.6.1 // indirect
-	github.com/prometheus/common v0.58.0 // 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
@@ -50,11 +51,11 @@ require (
 	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.17.1 // indirect
-	golang.org/x/crypto v0.27.0 // indirect
-	golang.org/x/net v0.29.0 // indirect
+	golang.org/x/crypto v0.28.0 // indirect
+	golang.org/x/net v0.30.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
-	google.golang.org/protobuf v1.34.2 // indirect
+	golang.org/x/sys v0.26.0 // indirect
+	golang.org/x/text v0.19.0 // indirect
+	google.golang.org/protobuf v1.35.1 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
--- a/go.sum
+++ b/go.sum
@@ -1,14 +1,38 @@
-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-20241002120813-a09a04e1a71e h1:77QHk5JSf0q13B/Ai3xjcsGSS7nX+9AfxcsYz5oDo/A=
-cloud.o-forge.io/core/oc-lib v0.0.0-20241002120813-a09a04e1a71e/go.mod h1:t+zpCTVKVdHH/BImwtMYY2QIWLMXKgY4n/JhFm3Vpu8=
+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=
+cloud.o-forge.io/core/oc-lib v0.0.0-20250213093249-c53e25e69a7b h1:HAb2h0011mE3QrHdOwJCua5w0r/BDOFLNb/557ZAzL0=
+cloud.o-forge.io/core/oc-lib v0.0.0-20250213093249-c53e25e69a7b/go.mod h1:2roQbUpv3a6mTIr5oU1ux31WbN8YucyyQvCQ0FqwbcE=
+cloud.o-forge.io/core/oc-lib v0.0.0-20250217072519-cafadec1469f h1:esLB0EAn8IuOChW35kcBrPaN80z4A4yYyz1mXT45GQo=
+cloud.o-forge.io/core/oc-lib v0.0.0-20250217072519-cafadec1469f/go.mod h1:2roQbUpv3a6mTIr5oU1ux31WbN8YucyyQvCQ0FqwbcE=
+cloud.o-forge.io/core/oc-lib v0.0.0-20250218080121-a098f0a672ee h1:UIGIiE+O5LUrP18C8nrZxN1v6Lmzfdlv8pvHnSLKJz8=
+cloud.o-forge.io/core/oc-lib v0.0.0-20250218080121-a098f0a672ee/go.mod h1:2roQbUpv3a6mTIr5oU1ux31WbN8YucyyQvCQ0FqwbcE=
+cloud.o-forge.io/core/oc-lib v0.0.0-20250218085355-6e6ed4ea2c64 h1:dANQHoMCyp3uioCHnUOpLFiG/UO+biyPUoSelDNJ814=
+cloud.o-forge.io/core/oc-lib v0.0.0-20250218085355-6e6ed4ea2c64/go.mod h1:2roQbUpv3a6mTIr5oU1ux31WbN8YucyyQvCQ0FqwbcE=
+cloud.o-forge.io/core/oc-lib v0.0.0-20250218092508-b771b5d25ee5 h1:EwoctMKdVG1PJHRcBcRKCxgdAxy+TV1T617vxIZwkio=
+cloud.o-forge.io/core/oc-lib v0.0.0-20250218092508-b771b5d25ee5/go.mod h1:2roQbUpv3a6mTIr5oU1ux31WbN8YucyyQvCQ0FqwbcE=
+cloud.o-forge.io/core/oc-lib v0.0.0-20250218101140-6bf058ab5ca4 h1:7om8VD4ZivHA2BKBwvqM98/a7D+MTwppd2FloNBg1Y4=
+cloud.o-forge.io/core/oc-lib v0.0.0-20250218101140-6bf058ab5ca4/go.mod h1:2roQbUpv3a6mTIr5oU1ux31WbN8YucyyQvCQ0FqwbcE=
+cloud.o-forge.io/core/oc-lib v0.0.0-20250218113916-04f7537066c1 h1:on0zLtHo1Jj6FvQ/wuJCc/sxfBfgrd2qTFknpDh3wQM=
+cloud.o-forge.io/core/oc-lib v0.0.0-20250218113916-04f7537066c1/go.mod h1:2roQbUpv3a6mTIr5oU1ux31WbN8YucyyQvCQ0FqwbcE=
+cloud.o-forge.io/core/oc-lib v0.0.0-20250218115549-81d3406305c5 h1:DP/XYrxSOc5ORMGvVNqTvFjxLF4cymUW/d3HIZXKDEk=
+cloud.o-forge.io/core/oc-lib v0.0.0-20250218115549-81d3406305c5/go.mod h1:2roQbUpv3a6mTIr5oU1ux31WbN8YucyyQvCQ0FqwbcE=
+cloud.o-forge.io/core/oc-lib v0.0.0-20250218130229-7c30633bded0 h1:3EsRmeTz6OWHJETrPObctnGF8WgZtXHfwL2cjyHcfOk=
+cloud.o-forge.io/core/oc-lib v0.0.0-20250218130229-7c30633bded0/go.mod h1:2roQbUpv3a6mTIr5oU1ux31WbN8YucyyQvCQ0FqwbcE=
+cloud.o-forge.io/core/oc-lib v0.0.0-20250219075511-241c6a5a0861 h1:XqTFKSZ8hXGCJbuu/SBwakpftevg1AKV7hDI50cXNUg=
+cloud.o-forge.io/core/oc-lib v0.0.0-20250219075511-241c6a5a0861/go.mod h1:2roQbUpv3a6mTIr5oU1ux31WbN8YucyyQvCQ0FqwbcE=
+cloud.o-forge.io/core/oc-lib v0.0.0-20250219100312-b4a176667754 h1:7J5EUe/iNS6cT6KVDklpgGH7ak30iEFgWJDEPF6wik4=
+cloud.o-forge.io/core/oc-lib v0.0.0-20250219100312-b4a176667754/go.mod h1:2roQbUpv3a6mTIr5oU1ux31WbN8YucyyQvCQ0FqwbcE=
+cloud.o-forge.io/core/oc-lib v0.0.0-20250219104152-3ecb0e9d960b h1:DhRqJdw2VePaYVlsh8OUA3zl+76Q0FWwGu+a+3aOf6s=
+cloud.o-forge.io/core/oc-lib v0.0.0-20250219104152-3ecb0e9d960b/go.mod h1:2roQbUpv3a6mTIr5oU1ux31WbN8YucyyQvCQ0FqwbcE=
+cloud.o-forge.io/core/oc-lib v0.0.0-20250219142942-5111c9c8bec7 h1:fh6SzBPenzIxufIIzExtx4jEE4OhFposqn3EbHFr92Q=
+cloud.o-forge.io/core/oc-lib v0.0.0-20250219142942-5111c9c8bec7/go.mod h1:2roQbUpv3a6mTIr5oU1ux31WbN8YucyyQvCQ0FqwbcE=
 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=
 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=
@@ -23,16 +47,14 @@ github.com/elazarl/go-bindata-assetfs v1.0.1 h1:m0kkaHRKEu7tUIUFVwhGGGYClXvyl4RE
 github.com/elazarl/go-bindata-assetfs v1.0.1/go.mod h1:v+YaWX3bdea5J/mo8dSETolEo7R71Vk1u8bnjau5yw4=
 github.com/etcd-io/etcd v3.3.17+incompatible/go.mod h1:cdZ77EstHBwVtD6iTgzgvogwcjo9m4iOqoijouPJ4bs=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
-github.com/gabriel-vasile/mimetype v1.4.5 h1:J7wGKdGu33ocBOhGy0z653k/lFKLFDPJMG8Gql0kxn4=
-github.com/gabriel-vasile/mimetype v1.4.5/go.mod h1:ibHel+/kbxn9x2407k1izTA1S81ku1z/DlgOW2QE0M4=
+github.com/gabriel-vasile/mimetype v1.4.6 h1:3+PzJTKLkvgjeTbts6msPJt4DixhT4YtFNf1gtGe3zc=
+github.com/gabriel-vasile/mimetype v1.4.6/go.mod h1:JX1qVKqZd40hUPpAfiNTe0Sne7hdfKSbOqqmkq8GCXc=
 github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s=
 github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
 github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA=
 github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY=
 github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY=
 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=
@@ -53,10 +75,8 @@ github.com/imdario/mergo v0.3.8/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJ
 github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
 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/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc=
+github.com/klauspost/compress v1.17.11/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=
@@ -95,16 +115,16 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/prometheus/client_golang v1.20.2 h1:5ctymQzZlyOON1666svgwn3s6IKWgfbjsejTMiXIyjg=
-github.com/prometheus/client_golang v1.20.2/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE=
+github.com/prometheus/client_golang v1.20.5 h1:cxppBPuYhUnsO6yo/aoRol4L7q7UFfdm+bR9r+8l63Y=
+github.com/prometheus/client_golang v1.20.5/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE=
 github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E=
 github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY=
-github.com/prometheus/common v0.58.0 h1:N+N8vY4/23r6iYfD3UQZUoJPnUYAo7v6LG5XZxjZTXo=
-github.com/prometheus/common v0.58.0/go.mod h1:GpWM7dewqmVYcd7SmRaiWVe9SSqjf0UrwnYnpEZNuT0=
+github.com/prometheus/common v0.60.1 h1:FUas6GcOw66yB/73KC+BOZoFJmbo/1pojoILArPAaSc=
+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=
@@ -132,27 +152,21 @@ github.com/xdg-go/stringprep v1.0.4/go.mod h1:mPGuuIYwz7CmR2bT9j4GbQqutWS1zV24gi
 github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 h1:ilQV1hzziu+LLM3zUTJ0trRztfwgjqKnBWNtSRkbmwM=
 github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78/go.mod h1:aL8wCCfTfSfmXjznFBSZNN13rSJjlIOI1fUNAtF7rmI=
 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.1 h1:Wic5cJIwJgSpBhe3lx3+/RybR5PiYRMpVFgO7cOHyIM=
 go.mongodb.org/mongo-driver v1.17.1/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/crypto v0.28.0 h1:GBDwsMXVQi34v5CCYUm2jkJvu4cbtru2U4TN2PSyQnw=
+golang.org/x/crypto v0.28.0/go.mod h1:rmgy+3RHxRZMyY0jjAJShp2zgEdOqj2AO7U0pYmeQ7U=
 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=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 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/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4=
+golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU=
 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=
@@ -167,23 +181,23 @@ golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
-golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo=
+golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
-golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224=
-golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
+golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM=
+golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
-google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
+google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA=
+google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
--- a/main.go
+++ b/main.go
@@ -1,13 +1,15 @@
 package main

 import (
-	_ "oc-peers/routers"
+	_ "oc-peer/routers"

 	oclib "cloud.o-forge.io/core/oc-lib"
+	"cloud.o-forge.io/core/oc-lib/tools"
 	beego "github.com/beego/beego/v2/server/web"
+	"github.com/beego/beego/v2/server/web/filter/cors"
 )

-const appname = "oc-peers"
+const appname = "oc-peer"

 func main() {
 	// Init the oc-lib
@@ -30,6 +32,14 @@ func main() {
 	beego.BConfig.Listen.HTTPPort = o.GetIntDefault("port", 8080)
 	beego.BConfig.WebConfig.DirectoryIndex = true
 	beego.BConfig.WebConfig.StaticDir["/swagger"] = "swagger"
-
+	api := &tools.API{}
+	api.Discovered(beego.BeeApp.Handlers.GetAllControllerInfo())
+	beego.InsertFilter("*", beego.BeforeRouter, cors.Allow(&cors.Options{
+		AllowAllOrigins:  true,
+		AllowMethods:     []string{"GET", "POST", "PUT", "DELETE", "OPTIONS"},
+		AllowHeaders:     []string{"Origin", "Authorization", "Content-Type"},
+		ExposeHeaders:    []string{"Content-Length", "Content-Type"},
+		AllowCredentials: true,
+	}))
 	beego.Run()
 }
--- a/BIN
+++ b/BIN
--- a/peers.json
+++ b/peers.json
@@ -1,5 +1,5 @@
 {
-    "port" : 8080,
+    "port" : 8093,
    "MONGO_URL":"mongodb://localhost:27017/", 
    "MONGO_DATABASE":"DC_myDC",
    "NATS_URL": "nats://localhost:4222"
--- a/routers/commentsRouter.go
+++ b/routers/commentsRouter.go
@@ -7,7 +7,7 @@ import (

 func init() {

-    beego.GlobalControllerRouter["oc-peers/controllers:PeerController"] = append(beego.GlobalControllerRouter["oc-peers/controllers:PeerController"],
+    beego.GlobalControllerRouter["oc-peer/controllers:PeerController"] = append(beego.GlobalControllerRouter["oc-peer/controllers:PeerController"],
        beego.ControllerComments{
            Method: "GetAll",
            Router: `/`,
@@ -16,7 +16,7 @@ func init() {
            Filters: nil,
            Params: nil})

-    beego.GlobalControllerRouter["oc-peers/controllers:PeerController"] = append(beego.GlobalControllerRouter["oc-peers/controllers:PeerController"],
+    beego.GlobalControllerRouter["oc-peer/controllers:PeerController"] = append(beego.GlobalControllerRouter["oc-peer/controllers:PeerController"],
        beego.ControllerComments{
            Method: "Put",
            Router: `/:id`,
@@ -25,7 +25,7 @@ func init() {
            Filters: nil,
            Params: nil})

-    beego.GlobalControllerRouter["oc-peers/controllers:PeerController"] = append(beego.GlobalControllerRouter["oc-peers/controllers:PeerController"],
+    beego.GlobalControllerRouter["oc-peer/controllers:PeerController"] = append(beego.GlobalControllerRouter["oc-peer/controllers:PeerController"],
        beego.ControllerComments{
            Method: "Get",
            Router: `/:id`,
@@ -34,7 +34,34 @@ func init() {
            Filters: nil,
            Params: nil})

-    beego.GlobalControllerRouter["oc-peers/controllers:PeerController"] = append(beego.GlobalControllerRouter["oc-peers/controllers:PeerController"],
+    beego.GlobalControllerRouter["oc-peer/controllers:PeerController"] = append(beego.GlobalControllerRouter["oc-peer/controllers:PeerController"],
+        beego.ControllerComments{
+            Method: "Blacklist",
+            Router: `/:id/blacklist`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["oc-peer/controllers:PeerController"] = append(beego.GlobalControllerRouter["oc-peer/controllers:PeerController"],
+        beego.ControllerComments{
+            Method: "Partner",
+            Router: `/:id/partner`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["oc-peer/controllers:PeerController"] = append(beego.GlobalControllerRouter["oc-peer/controllers:PeerController"],
+        beego.ControllerComments{
+            Method: "DeleteState",
+            Router: `/:id/undo_state`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["oc-peer/controllers:PeerController"] = append(beego.GlobalControllerRouter["oc-peer/controllers:PeerController"],
        beego.ControllerComments{
            Method: "Search",
            Router: `/search/:search`,
@@ -43,7 +70,7 @@ func init() {
            Filters: nil,
            Params: nil})

-    beego.GlobalControllerRouter["oc-peers/controllers:StatusController"] = append(beego.GlobalControllerRouter["oc-peers/controllers:StatusController"],
+    beego.GlobalControllerRouter["oc-peer/controllers:StatusController"] = append(beego.GlobalControllerRouter["oc-peer/controllers:StatusController"],
        beego.ControllerComments{
            Method: "Status",
            Router: `/`,
@@ -52,7 +79,7 @@ func init() {
            Filters: nil,
            Params: nil})

-    beego.GlobalControllerRouter["oc-peers/controllers:VersionController"] = append(beego.GlobalControllerRouter["oc-peers/controllers:VersionController"],
+    beego.GlobalControllerRouter["oc-peer/controllers:VersionController"] = append(beego.GlobalControllerRouter["oc-peer/controllers:VersionController"],
        beego.ControllerComments{
            Method: "GetAll",
            Router: `/`,
--- a/routers/router.go
+++ b/routers/router.go
@@ -1,5 +1,5 @@
 // @APIVersion 1.0.0
-// @Title oc-peers
+// @Title oc-peer
 // @Description Manage OpenCloud peers
 // @Contact admin@o-cloud.io
 // @TermsOfServiceUrl http://cloud.o-forge.io/
@@ -8,7 +8,7 @@
 package routers

 import (
-	"oc-peers/controllers"
+	"oc-peer/controllers"

 	beego "github.com/beego/beego/v2/server/web"
 )
@@ -20,10 +20,8 @@ func init() {
 				&controllers.StatusController{},
 			),
 		),
-		beego.NSNamespace("/peer",
-			beego.NSInclude(
-				&controllers.PeerController{},
-			),
+		beego.NSInclude(
+			&controllers.PeerController{},
 		),
 		beego.NSNamespace("/version",
 			beego.NSInclude(
--- a/swagger/swagger.json
+++ b/swagger/swagger.json
@@ -1,7 +1,7 @@
 {
    "swagger": "2.0",
    "info": {
-        "title": "oc-peers",
+        "title": "oc-peer",
        "description": "Manage OpenCloud peers\n",
        "version": "1.0.0",
        "termsOfService": "http://cloud.o-forge.io/",
@@ -9,19 +9,27 @@
            "email": "admin@o-cloud.io"
        },
        "license": {
-            "name": "MIT",
-            "url": "https://opensource.org/license/mit"
+            "name": "AGPL",
+            "url": "https://www.gnu.org/licenses/agpl-3.0.html"
        }
    },
    "basePath": "/oc/",
    "paths": {
-        "/peer/": {
+        "/": {
            "get": {
                "tags": [
-                    "peer"
+                    "oc-peer/controllersPeerController"
                ],
                "description": "find all peer\n\u003cbr\u003e",
                "operationId": "PeerController.GetAll",
+                "parameters": [
+                    {
+                        "in": "query",
+                        "name": "is_draft",
+                        "description": "false",
+                        "type": "string"
+                    }
+                ],
                "responses": {
                    "200": {
                        "description": "{peer} models.peer"
@@ -29,10 +37,10 @@
                }
            }
        },
-        "/peer/search/{search}": {
+        "/search/{search}": {
            "get": {
                "tags": [
-                    "peer"
+                    "oc-peer/controllersPeerController"
                ],
                "description": "search workspace\n\u003cbr\u003e",
                "operationId": "PeerController.Search",
@@ -43,6 +51,12 @@
                        "description": "the word search you want to get",
                        "required": true,
                        "type": "string"
+                    },
+                    {
+                        "in": "query",
+                        "name": "is_draft",
+                        "description": "false",
+                        "type": "string"
                    }
                ],
                "responses": {
@@ -52,62 +66,6 @@
                }
            }
        },
-        "/peer/{id}": {
-            "get": {
-                "tags": [
-                    "peer"
-                ],
-                "description": "find peer by peerid\n\u003cbr\u003e",
-                "operationId": "PeerController.Get",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "description": "the peer id you want to get",
-                        "required": true,
-                        "type": "string"
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "{peer} models.peer"
-                    }
-                }
-            },
-            "put": {
-                "tags": [
-                    "peer"
-                ],
-                "description": "create peers\n\u003cbr\u003e",
-                "operationId": "PeerController.Update",
-                "parameters": [
-                    {
-                        "in": "path",
-                        "name": "id",
-                        "description": "the peer id you want to get",
-                        "required": true,
-                        "type": "string"
-                    },
-                    {
-                        "in": "body",
-                        "name": "body",
-                        "description": "The peer content",
-                        "required": true,
-                        "schema": {
-                            "$ref": "#/definitions/models.peer"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "",
-                        "schema": {
-                            "$ref": "#/definitions/models.peer"
-                        }
-                    }
-                }
-            }
-        },
        "/status/": {
            "post": {
                "tags": [
@@ -145,6 +103,131 @@
                    }
                }
            }
+        },
+        "/{id}": {
+            "get": {
+                "tags": [
+                    "oc-peer/controllersPeerController"
+                ],
+                "description": "find peer by peerid\n\u003cbr\u003e",
+                "operationId": "PeerController.Get",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "description": "the peer id you want to get",
+                        "required": true,
+                        "type": "string"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "{peer} models.peer"
+                    }
+                }
+            },
+            "put": {
+                "tags": [
+                    "oc-peer/controllersPeerController"
+                ],
+                "description": "create peers\n\u003cbr\u003e",
+                "operationId": "PeerController.Update",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "description": "the peer id you want to get",
+                        "required": true,
+                        "type": "string"
+                    },
+                    {
+                        "in": "body",
+                        "name": "body",
+                        "description": "The peer content",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/models.peer"
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "",
+                        "schema": {
+                            "$ref": "#/definitions/models.peer"
+                        }
+                    }
+                }
+            }
+        },
+        "/{id}/blacklist": {
+            "post": {
+                "tags": [
+                    "oc-peer/controllersPeerController"
+                ],
+                "description": "add blacklist peer by peerid\n\u003cbr\u003e",
+                "operationId": "PeerController.Blacklist",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "description": "the peer id you want to blacklist",
+                        "required": true,
+                        "type": "string"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "{peer} models.peer"
+                    }
+                }
+            }
+        },
+        "/{id}/partner": {
+            "post": {
+                "tags": [
+                    "oc-peer/controllersPeerController"
+                ],
+                "description": "add partner peer by peerid\n\u003cbr\u003e",
+                "operationId": "PeerController.Partner",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "description": "the peer id you want to partner",
+                        "required": true,
+                        "type": "string"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "{peer} models.peer"
+                    }
+                }
+            }
+        },
+        "/{id}/undo_state": {
+            "post": {
+                "tags": [
+                    "oc-peer/controllersPeerController"
+                ],
+                "description": "delete state peer by peerid\n\u003cbr\u003e",
+                "operationId": "PeerController.DeleteState",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "description": "the peer id you want to delete state",
+                        "required": true,
+                        "type": "string"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "{peer} models.peer"
+                    }
+                }
+            }
        }
    },
    "definitions": {
@@ -163,7 +246,7 @@
            "description": "Operations about workflow\n"
        },
        {
-            "name": "peer",
+            "name": "oc-peer/controllersPeerController",
            "description": "Operations about workflow\n"
        },
        {
--- a/swagger/swagger.yml
+++ b/swagger/swagger.yml
@@ -1,6 +1,6 @@
 swagger: "2.0"
 info:
-  title: oc-peers
+  title: oc-peer
  description: |
    Manage OpenCloud peers
  version: 1.0.0
@@ -8,25 +8,30 @@ info:
  contact:
    email: admin@o-cloud.io
  license:
-    name: MIT
-    url: https://opensource.org/license/mit
+    name: AGPL
+    url: https://www.gnu.org/licenses/agpl-3.0.html
 basePath: /oc/
 paths:
-  /peer/:
+  /:
    get:
      tags:
-      - peer
+      - oc-peer/controllersPeerController
      description: |-
        find all peer
        <br>
      operationId: PeerController.GetAll
+      parameters:
+      - in: query
+        name: is_draft
+        description: "false"
+        type: string
      responses:
        "200":
          description: '{peer} models.peer'
-  /peer/{id}:
+  /{id}:
    get:
      tags:
-      - peer
+      - oc-peer/controllersPeerController
      description: |-
        find peer by peerid
        <br>
@@ -42,7 +47,7 @@ paths:
          description: '{peer} models.peer'
    put:
      tags:
-      - peer
+      - oc-peer/controllersPeerController
      description: |-
        create peers
        <br>
@@ -64,10 +69,61 @@ paths:
          description: ""
          schema:
            $ref: '#/definitions/models.peer'
-  /peer/search/{search}:
+  /{id}/blacklist:
+    post:
+      tags:
+      - oc-peer/controllersPeerController
+      description: |-
+        add blacklist peer by peerid
+        <br>
+      operationId: PeerController.Blacklist
+      parameters:
+      - in: path
+        name: id
+        description: the peer id you want to blacklist
+        required: true
+        type: string
+      responses:
+        "200":
+          description: '{peer} models.peer'
+  /{id}/partner:
+    post:
+      tags:
+      - oc-peer/controllersPeerController
+      description: |-
+        add partner peer by peerid
+        <br>
+      operationId: PeerController.Partner
+      parameters:
+      - in: path
+        name: id
+        description: the peer id you want to partner
+        required: true
+        type: string
+      responses:
+        "200":
+          description: '{peer} models.peer'
+  /{id}/undo_state:
+    post:
+      tags:
+      - oc-peer/controllersPeerController
+      description: |-
+        delete state peer by peerid
+        <br>
+      operationId: PeerController.DeleteState
+      parameters:
+      - in: path
+        name: id
+        description: the peer id you want to delete state
+        required: true
+        type: string
+      responses:
+        "200":
+          description: '{peer} models.peer'
+  /search/{search}:
    get:
      tags:
-      - peer
+      - oc-peer/controllersPeerController
      description: |-
        search workspace
        <br>
@@ -78,6 +134,10 @@ paths:
        description: the word search you want to get
        required: true
        type: string
+      - in: query
+        name: is_draft
+        description: "false"
+        type: string
      responses:
        "200":
          description: '{workspace} models.workspace'
@@ -120,7 +180,7 @@ tags:
 - name: status
  description: |
    Operations about workflow
- name: peer
+- name: oc-peer/controllersPeerController
  description: |
    Operations about workflow
 - name: version
--- a/tests/default_test.go
+++ b/tests/default_test.go
@@ -3,7 +3,7 @@ package test
 import (
 	"net/http"
 	"net/http/httptest"
-	_ "oc-peers/routers"
+	_ "oc-peer/routers"
 	"path/filepath"
 	"runtime"
 	"testing"
Author	SHA1	Message	Date
mr	7b4d76e830	adjustment	2025-03-28 08:47:20 +01:00
mr	0cd3a9457e	adjustment	2025-03-28 08:46:50 +01:00
mr	fe5163b3d9	dev launch mode	2025-03-06 09:33:16 +01:00
mr	edd21a00d9	neo oclib	2025-02-21 11:19:34 +01:00
mr	daad167eaf	traefik	2025-02-19 12:04:57 +01:00
mr	f7c6179b91	oclib update	2025-02-18 15:03:25 +01:00
mr	3ef5f4598a	Merge branch 'feature/payment' into main	2025-02-13 10:23:37 +01:00
mr	b3cb2c47b8	neo oc-lib	2025-02-06 08:54:33 +01:00
mr	55a57493a7	neo oc-lib adapter	2025-02-05 08:40:21 +01:00
mr	815bef5798	oc-peer	2025-01-17 17:22:25 +01:00
plm	0534eb01ae	Support CORS	2025-01-15 11:37:46 +01:00
plm	ca2c176f00	remove binary	2025-01-10 21:21:02 +01:00
plm	60f70321ef	Modifications for k8s integration	2025-01-10 18:07:15 +01:00
mr	421ba7f3e0	oclib	2024-11-21 11:04:16 +01:00
mr	1a2d831b0a	oclib	2024-11-08 14:01:55 +01:00
mr	f41b4c6780	oclib	2024-11-07 13:39:45 +01:00
mr	e4c5d3bed6	peer	2024-11-04 14:28:38 +01:00
mr	3349c56e6f	peer	2024-11-04 14:22:34 +01:00
mr	edb6303630	peer	2024-10-30 17:10:36 +01:00
mr	5167726f68	oclib	2024-10-30 14:02:22 +01:00
mr	a5313546f8	peer traefik	2024-10-30 10:47:38 +01:00
mr	bafadee9d5	add control for partner ship	2024-10-15 16:55:29 +02:00
mr	a6f546ceee	Local Update Neo Peer	2024-10-15 10:51:12 +02:00
mr	5959919ef9	Merge branch 'main' of https://cloud.o-forge.io/core/oc-peers into main	2024-10-07 08:41:35 +02:00
mr	922799cbd4	test	2024-10-02 15:38:36 +02:00