merge

.gitea/workflows/build.yml

@@ -1,81 +0,0 @@
-name: Build and Push Docker Image
-
-on:
-  push:
-    tags:
-      - '*'
-    branches:
-      - main
-      - dev
-
-jobs:
-  build_and_push:
-    runs-on: ubuntu-latest
-
-    steps:
-    - name: Install Docker
-      run: |
-        apt-get update
-        apt-get install -y docker.io
-
-    - name: Checkout Repository
-      uses: actions/checkout@v4
-
-    - name: Set Kubernetes Context
-      uses: azure/k8s-set-context@v4
-      with:
-        method: kubeconfig
-        kubeconfig: ${{secrets.buildx_kubeconfig}}
-
-    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v3
-      with:
-        driver: kubernetes
-        driver-opts: |
-          namespace=gitea
-
-    - name: Login to Docker Registry
-      uses: docker/login-action@v3
-      with:
-        registry: git.coopgo.io
-        username: ${{ secrets.REGISTRY_USER }}
-        password: ${{ secrets.REGISTRY_TOKEN }}
-
-    - name: Extract metadata (tags, labels) for Docker image
-      id: metadata
-      uses: docker/metadata-action@v3
-      with:
-        images: git.coopgo.io/${{gitea.repository}}
-        tags: |
-          type=ref,event=branch
-          type=ref,event=tag
-          type=ref,event=pr
-        flavor: |
-          latest=auto
-
-    - name: Build and push
-      uses: docker/build-push-action@v5
-      with:
-        context: .
-        push: true
-        tags: |
-          ${{ steps.metadata.outputs.tags }}
-        build-args: |		
-          ACCESS_TOKEN_USR=${{gitea.actor}}
-          ACCESS_TOKEN_PWD=${{gitea.token}}
-
-    # BUILD WITH KANIKO
-    # - name: Kaniko build and push
-    #   uses: aevea/action-kaniko@master
-    #   with:
-    #     build_file: Dockerfile
-    #     registry: git.coopgo.io
-    #     username: ${{secrets.registry_user}}
-    #     password: ${{secrets.registry_token}}
-    #     image: ${{gitea.repository}}
-    #     tag: ${{gitea.ref_name}}
-    #     cache: true
-    #     cache_registry: git.coopgo.io/${{gitea.repository}}/cache
-    #     extra-args: |
-    #       ACCESS_TOKEN_USR=${{gitea.actor}}
-    #       ACCESS_TOKEN_PWD=${{gitea.token}}

go.sum

@@ -109,7 +109,6 @@ github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QD
 github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
 github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
 github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
@@ -555,8 +554,6 @@ google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp0
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
-google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w=
-google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
 google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

handlers/events.go

@@ -59,7 +59,6 @@ func (h AgendaHandler) SubscribeEvent(eventid string, subscriber string, data ma
 	subscription := storage.Subscription{
 		ID:         id,
 		Subscriber: subscriber,
-		EventID:    eventid,
 		Tags:       []string{},
 		CreatedAt:  now,
 		Data:       map[string]any{},
@@ -81,7 +80,6 @@ func (h AgendaHandler) DeleteSubscription(eventid string, subscriber string, dat
 	deletesubscription := storage.Subscription{
 		ID:         id,
 		Subscriber: subscriber,
-		EventID:    eventid,
 		Tags:       []string{},
 		CreatedAt:  now,
 		Data:       map[string]any{},
@@ -103,17 +101,6 @@ func (h AgendaHandler) UpdateEvent(event storage.Event) (*storage.Event, error)
 	return &event, nil
 }
 
-func (h AgendaHandler) GetSubscriber(subscriber string) (results []storage.Subscription, err error) {
-	if subscriber == "" {
-		return nil, errors.New("missing subscriber")
-	}
-	results, err = h.storage.GetSubscriber(subscriber)
-	if err != nil {
-		return nil, err
-	}
-	return results, nil
-}
-
 func (h AgendaHandler) GetSubscriptionByUser(subscriber string) (results []storage.Subscription, err error) {
 	if subscriber == "" {
 		return nil, errors.New("missing subscriber")

storage/mongodb.go

@@ -92,11 +92,18 @@ func (s MongoDBStorage) GetEvents(namespaces []string) (events []Event, err erro
 
 	for cur.Next(context.TODO()) {
 		var event Event
+		//var elem bson.M
 
 		if err := cur.Decode(&event); err != nil {
 			return events, err
 		}
 
+		// fmt.Println(elem)
+
+		// bsonBytes, _ := bson.Marshal(elem)
+		// fmt.Println(string(bsonBytes))
+		// bson.Unmarshal(bsonBytes, &event)
+
 		events = append(events, event)
 
 	}
@@ -147,37 +154,10 @@ func (s MongoDBStorage) UpdateEvent(event Event) error {
 	return nil
 }
 
-func (s MongoDBStorage) GetSubscriber(subscriber string) ([]Subscription, error) {
+func (psql MongoDBStorage) GetSubscriber(subscriber string) ([]Subscription, error) {
-	collection := s.Client.Database(s.DbName).Collection(s.Collections["events"])
+	return nil, nil
-	subscriptions := []Subscription{}
-
-	var cur *mongo.Cursor
-
-	cur, err := collection.Find(context.TODO(), bson.M{"subscriptions": bson.M{"$elemMatch": bson.M{"subscriber": subscriber}}})
-	if err != nil {
-		return subscriptions, err
-	}
-	for cur.Next(context.Background()) {
-		var event Event
-		if err := cur.Decode(&event); err != nil {
-			return subscriptions, err
-		}
-		for i := range event.Subscriptions {
-			if event.Subscriptions[i].Subscriber == subscriber {
-				subscriptions = append(subscriptions, event.Subscriptions[i])
-			}
-		}
-	}
-	fmt.Println(subscriptions)
-	return subscriptions, nil
 }
 
-func (s MongoDBStorage) GetSubscriptionByUser(subscriber string) ([]Subscription, error) {
+func (psql MongoDBStorage) GetSubscriptionByUser(subscriber string) ([]Subscription, error) {
-	events, err := s.GetSubscriber(subscriber)
+	return nil, nil
-	if err != nil {
-		panic(err)
-	}
-	fmt.Println(events)
-	return events, nil
-	//return nil, nil
 }

storage/storage.go

@@ -13,7 +13,6 @@ type Storage interface {
 	AddSubscription(eventid string, subscription Subscription) error
 	UpdateSubscription(eventid string, subscriber string, deletesubscription Subscription) error
 	UpdateEvent(Event) error
-	GetSubscriber(subscriber string) ([]Subscription, error)
 	GetSubscriptionByUser(subscriber string) ([]Subscription, error)
 }
 type StorageImpl struct {