changed account and membership to get their dependencies from struct, made unit test pass

Author: dstpierre

Makefile

@@ -13,7 +13,7 @@ deploy:
 	scp -qr ./templates/* sb-poc:/home/dstpierre/templates/
 
 test:
-	@JWT_SECRET=okdevmode go test -v --race --cover ./...
+	@JWT_SECRET=okdevmode go test --race --cover ./...
 
 docker:
 	docker build . -t staticbackend:latest

account.go

@@ -27,7 +27,9 @@ var (
 	letterRunes = []rune("abcdefghijkmnopqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ2345679")
 )
 
-type accounts struct{}
+type accounts struct {
+	membership *membership
+}
 
 func (a *accounts) create(w http.ResponseWriter, r *http.Request) {
 	var email string
@@ -145,7 +147,7 @@ func (a *accounts) create(w http.ResponseWriter, r *http.Request) {
 	db = client.Database(dbName)
 	pw := randStringRunes(6)
 
-	if _, _, err := createAccountAndUser(db, email, pw, 100); err != nil {
+	if _, _, err := a.membership.createAccountAndUser(db, email, pw, 100); err != nil {
 		http.Error(w, err.Error(), http.StatusInternalServerError)
 		return
 	}

db_test.go

@@ -40,12 +40,12 @@ func dbPost(t *testing.T, hf func(http.ResponseWriter, *http.Request), repo stri
 	req.Header.Set("Authorization", fmt.Sprintf("Bearer %s", tok))
 
 	stdAuth := []middleware.Middleware{
-		middleware.WithDB(database.client),
-		middleware.RequireAuth(database.client),
+		middleware.WithDB(database.client, volatile),
+		middleware.RequireAuth(database.client, volatile),
 	}
 	if params[0] {
 		stdAuth = []middleware.Middleware{
-			middleware.WithDB(client),
+			middleware.WithDB(client, volatile),
 			middleware.RequireRoot(client),
 		}
 	}
@@ -128,7 +128,7 @@ func TestDBListCollections(t *testing.T) {
 	req.Header.Set("Authorization", fmt.Sprintf("Bearer %s", rootToken))
 
 	stdRoot := []middleware.Middleware{
-		middleware.WithDB(database.client),
+		middleware.WithDB(database.client, volatile),
 		middleware.RequireRoot(database.client),
 	}
 	h := middleware.Chain(http.HandlerFunc(database.listCollections), stdRoot...)

function/management.go

@@ -81,7 +81,7 @@ func GetForExecution(db *mongo.Database, name string) (ExecData, error) {
 
 	ctx := context.Background()
 	opt := &options.FindOneOptions{}
-	opt.SetProjection(bson.M{"h": -1})
+	opt.SetProjection(bson.M{"h": false})
 
 	sr := db.Collection("sb_functions").FindOne(ctx, filter, opt)
 	if err := sr.Decode(&result); err != nil {

function/runtime.go

@@ -347,7 +347,7 @@ func (env *ExecutionEnvironment) addVolatileFunctions(vm *goja.Runtime) {
 
 func (env *ExecutionEnvironment) complete(err error) {
 	env.CurrentRun.Completed = time.Now()
-	env.CurrentRun.Success = err == mongo.ErrNilCursor
+	env.CurrentRun.Success = err == nil
 
 	env.CurrentRun.Output = append(env.CurrentRun.Output, "Function completed")
 

function/scheduler.go

@@ -44,7 +44,7 @@ type MetaMessage struct {
 func (ts *TaskScheduler) Start() {
 	tasks, err := ts.listTasks()
 	if err != nil {
-		log.Println("error loading tasks: %v", err)
+		log.Println("error loading tasks: ", err)
 		return
 	}
 
@@ -54,7 +54,7 @@ func (ts *TaskScheduler) Start() {
 	for _, task := range tasks {
 		_, err := ts.Scheduler.Cron(task.Interval).Tag(task.ID.Hex()).Do(ts.run, task)
 		if err != nil {
-			log.Println("error scheduling this task: %s -> %v", task.ID.Hex(), err)
+			log.Printf("error scheduling this task: %s -> %v\n", task.ID.Hex(), err)
 		}
 	}
 }
@@ -123,7 +123,7 @@ func (ts *TaskScheduler) run(task Task) {
 		}
 
 		if err := ts.Volatile.SetTyped("root:"+task.BaseName, auth); err != nil {
-			log.Printf("error setting auth inside TaskScheduler.run: ", err)
+			log.Println("error setting auth inside TaskScheduler.run: ", err)
 			return
 		}
 	}

functions.go

@@ -1,6 +1,7 @@
 package staticbackend
 
 import (
+	"fmt"
 	"net/http"
 	"staticbackend/db"
 	"staticbackend/function"
@@ -99,6 +100,9 @@ func (f *functions) exec(w http.ResponseWriter, r *http.Request) {
 
 	curDB := client.Database(conf.Name)
 
+	fmt.Println("DEBUG: search for name: ", data.FunctionName)
+	fmt.Println("DEBUG: base: ", conf.Name)
+
 	fn, err := function.GetForExecution(curDB, data.FunctionName)
 	if err != nil {
 		http.Error(w, err.Error(), http.StatusInternalServerError)
@@ -111,6 +115,7 @@ func (f *functions) exec(w http.ResponseWriter, r *http.Request) {
 		Base: f.base,
 		Data: fn,
 	}
+
 	if err := env.Execute(r); err != nil {
 		http.Error(w, err.Error(), http.StatusInternalServerError)
 		return

functions_test.go

@@ -10,7 +10,7 @@ import (
 func TestFunctionsExecuteDBOperations(t *testing.T) {
 	code := `
 	log("works here");
-	function handle() {
+	function handle(body) {
 		var o = {
 			desc: "yep", 
 			done: false, 
@@ -66,6 +66,7 @@ func TestFunctionsExecuteDBOperations(t *testing.T) {
 	data := function.ExecData{
 		FunctionName: "unittest",
 		Code:         code,
+		TriggerTopic: "web",
 	}
 	addResp := dbPost(t, funexec.add, "", data, true)
 	if addResp.StatusCode != http.StatusOK {
@@ -79,7 +80,7 @@ func TestFunctionsExecuteDBOperations(t *testing.T) {
 		t.Errorf("add: expected status 200 got %s", addResp.Status)
 	}
 
-	execResp := dbPost(t, funexec.exec, "", data)
+	execResp := dbPost(t, funexec.exec, "", data, true)
 	if execResp.StatusCode != http.StatusOK {
 		b, err := io.ReadAll(execResp.Body)
 		if err != nil {

main_test.go

@@ -41,9 +41,9 @@ func TestMain(m *testing.M) {
 		log.Fatal(err)
 	}
 
-	deleteAndSetupTestAccount()
+	volatile = cache.NewCache()
 
-	volatile := cache.NewCache()
+	deleteAndSetupTestAccount()
 
 	hub := newHub(volatile)
 	go hub.run()
@@ -107,8 +107,10 @@ func deleteAndSetupTestAccount() {
 
 	pubKey = base.ID.Hex()
 
+	m := &membership{volatile: volatile}
+
 	db := client.Database(dbName)
-	token, dbToken, err := createAccountAndUser(db, admEmail, password, 100)
+	token, dbToken, err := m.createAccountAndUser(db, admEmail, password, 100)
 	if err != nil {
 		log.Fatal(err)
 	}
@@ -117,7 +119,7 @@ func deleteAndSetupTestAccount() {
 
 	rootToken = fmt.Sprintf("%s|%s|%s", dbToken.ID.Hex(), dbToken.AccountID.Hex(), dbToken.Token)
 
-	token, _, err = createUser(db, dbToken.AccountID, userEmail, userPassword, 0)
+	token, _, err = m.createUser(db, dbToken.AccountID, userEmail, userPassword, 0)
 	if err != nil {
 		log.Fatal(err)
 	}