feat: working api route to postgres nd strategy implementation

Author: syntaxsdev

bin/air

@@ -2,22 +2,22 @@ module github.com/syntaxsdev/mercury
 
 go 1.22.7
 
+require (
+	github.com/go-chi/chi/v5 v5.2.0
+	github.com/redis/go-redis/v9 v9.7.0
+	go.mongodb.org/mongo-driver v1.17.1
+	go.mongodb.org/mongo-driver/v2 v2.0.0
+)
+
 require (
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
-	github.com/go-chi/chi/v5 v5.2.0 // indirect
-	github.com/golang-migrate/migrate/v4 v4.18.1 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
-	github.com/hashicorp/errwrap v1.1.0 // indirect
-	github.com/hashicorp/go-multierror v1.1.1 // indirect
 	github.com/klauspost/compress v1.17.11 // indirect
-	github.com/redis/go-redis/v9 v9.7.0 // indirect
 	github.com/xdg-go/pbkdf2 v1.0.0 // indirect
 	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/v2 v2.0.0 // indirect
-	go.uber.org/atomic v1.11.0 // indirect
 	golang.org/x/crypto v0.31.0 // indirect
 	golang.org/x/sync v0.10.0 // indirect
 	golang.org/x/text v0.21.0 // indirect

go.mod

@@ -1,22 +1,21 @@
+github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs=
+github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdbAV9g4c=
+github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA=
+github.com/bsm/gomega v1.27.10/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0H+O0=
 github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
 github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
 github.com/go-chi/chi/v5 v5.2.0 h1:Aj1EtB0qR2Rdo2dG4O94RIU35w2lvQSj6BRA4+qwFL0=
 github.com/go-chi/chi/v5 v5.2.0/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
-github.com/golang-migrate/migrate/v4 v4.18.1 h1:JML/k+t4tpHCpQTCAD62Nu43NUFzHY4CV3uAuvHGC+Y=
-github.com/golang-migrate/migrate/v4 v4.18.1/go.mod h1:HAX6m3sQgcdO81tdjn5exv20+3Kb13cmGli1hrD6hks=
 github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
 github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
-github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
-github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
-github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
-github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=
-github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
+github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
+github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc=
 github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/redis/go-redis/v9 v9.7.0 h1:HhLSs+B6O021gwzl+locl0zEDnyNkxMtf/Z3NNBMa9E=
 github.com/redis/go-redis/v9 v9.7.0/go.mod h1:f6zhXITC7JUJIlPEiBOTXxJgPLdZcA93GewI7inzyWw=
 github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c=
@@ -28,10 +27,10 @@ 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.17.1 h1:Wic5cJIwJgSpBhe3lx3+/RybR5PiYRMpVFgO7cOHyIM=
+go.mongodb.org/mongo-driver v1.17.1/go.mod h1:wwWm/+BuOddhcq3n68LKRmgk2wXzmF6s0SFOa0GINL4=
 go.mongodb.org/mongo-driver/v2 v2.0.0 h1:Jfd7XpdZa9yk3eY774bO7SWVb30noLSirL9nKTpavhI=
 go.mongodb.org/mongo-driver/v2 v2.0.0/go.mod h1:nSjmNq4JUstE8IRZKTktLgMHM4F1fccL6HGX1yh+8RA=
-go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE=
-go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=

go.sum

@@ -0,0 +1,18 @@
+package handlers
+
+import (
+	"encoding/json"
+	"net/http"
+
+	"github.com/syntaxsdev/mercury/models"
+)
+
+func WriteHttp(w http.ResponseWriter, code int, message string, data interface{}) error {
+	w.Header().Set("Content-Type", "application/json")
+	w.WriteHeader(code)
+	err := json.NewEncoder(w).Encode(models.Response{Message: message, Code: code, Data: data})
+	if err != nil {
+		return err
+	}
+	return nil
+}

internal/handlers/helpers.go

@@ -2,22 +2,82 @@ package handlers
 
 import (
 	"encoding/json"
+	"log"
 	"net/http"
 
 	"github.com/syntaxsdev/mercury/internal/services"
 	"github.com/syntaxsdev/mercury/models"
+	"go.mongodb.org/mongo-driver/bson"
 )
 
 // Get All Strategies
 func GetAllStrategies(w http.ResponseWriter, r *http.Request, f *services.Factory) {
+	var results []interface{}
+	var payload map[string]interface{}
+	if err := json.NewDecoder(r.Body).Decode(&payload); err != nil {
+		payload = nil
+	}
+
+	if payload != nil {
+		err := f.MongoService.First("strategies", bson.M(payload), &results)
+		if err == nil && results == nil {
+			WriteHttp(w, http.StatusNotFound, "Nothing was found with the supplied filter", nil)
+			return
+		} else if err == nil {
+			log.Println("Here")
+			WriteHttp(w, http.StatusOK, "Successfully fetched all strategies by filter", results)
+		}
+		log.Println("Here", err)
+	}
+	err := f.MongoService.All("strategies", bson.M{}, &results)
+	if err != nil {
+		http.Error(w, "Could not retrieve strategies.", http.StatusInternalServerError)
+		return
+	}
+	code := http.StatusOK
+	WriteHttp(w, code, "Successfully fetched all strategies", results)
 
 }
 
+// // Get Strategy By ID
+// func GetStrategyByID(w http.ResponseWriter, r *http.Request, f *services.Factory) {
+// 	var result interface{}
+// 	id := chi.URLParam(r, "id")
+// 	port, err := strconv.Atoi(id)
+// 	if err != nil {
+// 		WriteHttp(w, http.StatusBadRequest, "Invalid", err)
+// 	}
+// 	// objectID, err := primitive.ObjectIDFromHex(id)
+// 	// if err != nil {
+// 	// 	WriteHttp(w, http.StatusBadRequest, "Invalid ID", err)
+// 	// 	return
+// 	// }
+
+// 	err = f.MongoService.First("strategies", bson.M{"port": port}, &result)
+// 	if err != nil {
+// 		WriteHttp(w, http.StatusBadRequest, "Could not retrieve strategy by ID.", nil)
+// 		log.Println(err)
+// 		return
+// 	}
+// 	WriteHttp(w, http.StatusOK, "Successfully fetched strategy", result)
+
+// }
+
 // Create A Strategy
 func CreateStrategy(w http.ResponseWriter, r *http.Request, f *services.Factory) {
 	var newStrategy models.Strategy
 	if err := json.NewDecoder(r.Body).Decode(&newStrategy); err != nil {
-
+		http.Error(w, "Invalid payload", http.StatusBadRequest)
+		return
 	}
-	f.MongoService.Insert("strategies", newStrategy)
+	res, err := f.MongoService.Insert("strategies", newStrategy)
+	if err != nil {
+		http.Error(w, "Could not insert strategy", http.StatusInternalServerError)
+	}
+
+	WriteHttp(w, http.StatusCreated, "Strategy successfully created", res)
+	// code := http.StatusCreated
+	// w.Header().Set("Content-Type", "application/json")
+	// w.WriteHeader(http.StatusCreated)
+	// json.NewEncoder(w).Encode(models.Response{Message: "Strategy successfully created", Code: code, Data: res})
 }

internal/handlers/strategy.go

@@ -2,6 +2,7 @@ package services
 
 import (
 	"context"
+	"log"
 	"time"
 
 	"go.mongodb.org/mongo-driver/v2/mongo"
@@ -27,10 +28,18 @@ func (s *MongoService) Insert(collection string, item interface{}) (interface{},
 
 func (s *MongoService) First(collection string, filter interface{}, result interface{}) error {
 	coll := s.Client.Database(s.DatabaseName).Collection(collection)
-	ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
+	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
 	defer cancel()
-
+	log.Println(filter)
+	log.Println(collection)
 	err := coll.FindOne(ctx, filter).Decode(result)
+	log.Println(result)
+	if err == mongo.ErrNoDocuments {
+		if resultPtr, ok := result.(*interface{}); ok {
+			*resultPtr = nil
+		}
+		return nil
+	}
 	return err
 
 }

internal/services/mongo.go

@@ -17,10 +17,13 @@ func main() {
 	// Get environment variables
 	dbHost := os.Getenv("DB_HOST")
 	dbName := os.Getenv("DB_NAME")
+	dbUser := os.Getenv("DB_USER")
+	dbPass := os.Getenv("DB_PASSWORD")
+	dbPort := os.Getenv("DB_PORT")
 
 	// Set defaults
 	if dbHost == "" {
-		dbHost = "localhost:27017"
+		dbHost = "localhost"
 		log.Printf("INFO: No `DB_HOST` set. Defaulting to %s\n", dbHost)
 	}
 
@@ -29,8 +32,25 @@ func main() {
 		log.Printf("INFO: No `DN_NAME` set. Defaulting to %s\n", dbName)
 	}
 
+	if dbUser == "" {
+		dbUser = "mercury"
+		log.Printf("INFO: No `DB_USER` set. Defaulting to %s\n", dbUser)
+	}
+
+	if dbPass == "" {
+		dbPass = "mercury_db"
+		log.Printf("INFO: No `DB_PASSWORD` set. Defaulting...")
+	}
+
+	if dbPort == "" {
+		dbPort = "27017"
+		log.Printf("INFO: No `DB_USER` set. Defaulting to %s\n", dbUser)
+	}
+
 	// Create MongoDB client
-	mongo, cleanup := repositories.NewMongoClient(dbHost)
+	connString := fmt.Sprintf("mongodb://%s:%s@%s:%s", dbUser, dbPass, dbHost, dbPort)
+	log.Println(connString)
+	mongo, cleanup := repositories.NewMongoClient(connString)
 	defer cleanup()
 	ms := services.MongoService{Client: mongo, DatabaseName: dbName}
 
@@ -40,6 +60,7 @@ func main() {
 	// Start Routes
 	router := api.InitRoutes(&factory)
 
+	log.Printf("INFO: Starting Server... Listening on localhost:%s\n", dbPort)
 	if err := http.ListenAndServe(":8080", router); err != nil {
 		log.Fatalf("Serve failed to start: %v", err)
 	}

main.go

@@ -9,5 +9,5 @@ type Strategy struct {
 
 type StrategyOptions struct {
 	Active bool        `json:"active"`
-	Meta   interface{} `json:"meta,omitempty"` // Any data
+	Meta   interface{} `json:"meta,omitempty"` // Any dictionary data allowed here
 }