From 4269bacf2a8111170a654b557bb2c0532fbbd744 Mon Sep 17 00:00:00 2001
From: Michael Hohn <hohn@github.com>
Date: Tue, 21 May 2024 11:45:47 -0700
Subject: [PATCH] wip: update store. references to storage. in server.go

---
 pkg/server/server.go   | 26 +++++++++-----------------
 pkg/storage/storage.go |  6 ++++++
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/pkg/server/server.go b/pkg/server/server.go
index 50d6da0..c2f247c 100644
--- a/pkg/server/server.go
+++ b/pkg/server/server.go
@@ -21,7 +21,6 @@ import (
 	"github.com/gorilla/mux"
 	"github.com/hohn/ghes-mirva-server/api"
 	co "github.com/hohn/ghes-mirva-server/common"
-	"github.com/hohn/ghes-mirva-server/store"
 )
 
 func (c *CommanderSingle) Run() {
@@ -279,14 +278,12 @@ func (c *CommanderSingle) MirvaRequestID(w http.ResponseWriter, r *http.Request)
 func (c *CommanderSingle) MirvaRequest(w http.ResponseWriter, r *http.Request) {
 	vars := mux.Vars(r)
 	slog.Info("New mrva run ", "owner", vars["owner"], "repo", vars["repo"])
-	// session := new(MirvaSession)
+
 	session_id := c.st.Storage.NextID()
 	session_owner := vars["owner"]
 	session_controller_repo := vars["repo"]
 	slog.Info("new run", "id: ", fmt.Sprint(session_id), session_owner, session_controller_repo)
-
 	session_language, session_repositories, session_tgz_ref, err := c.collectRequestInfo(w, r, session_id)
-
 	if err != nil {
 		return
 	}
@@ -312,7 +309,8 @@ func (c *CommanderSingle) MirvaRequest(w http.ResponseWriter, r *http.Request) {
 		AnalysisRepos: analysisRepos,
 	}
 
-	submit_response, err := c.submit_response(si)
+	slog.Debug("Forming and sending response for submitted analysis job", "id", si.ID)
+	submit_response, err := submit_response(si)
 	if err != nil {
 		http.Error(w, err.Error(), http.StatusInternalServerError)
 		return
@@ -320,10 +318,6 @@ func (c *CommanderSingle) MirvaRequest(w http.ResponseWriter, r *http.Request) {
 
 	w.Header().Set("Content-Type", "application/json")
 	w.Write(submit_response)
-
-	// TODO into Storage
-	// session_save()
-
 }
 
 func ORToArr(aor []co.OwnerRepo) ([]string, int) {
@@ -335,10 +329,7 @@ func ORToArr(aor []co.OwnerRepo) ([]string, int) {
 	return repos, count
 }
 
-func (c *CommanderSingle) submit_response(sn SessionInfo) ([]byte, error) {
-
-	slog.Debug("Forming and sending response for submitted analysis job", "id", sn.ID)
-
+func submit_response(sn SessionInfo) ([]byte, error) {
 	// Construct the response bottom-up
 	var m_cr api.ControllerRepo
 	var m_ac api.Actor
@@ -378,7 +369,7 @@ func (c *CommanderSingle) submit_response(sn SessionInfo) ([]byte, error) {
 	joblist := storage.GetJobList(sn.ID)
 
 	for _, job := range joblist {
-		store.SetJobInfo(co.JobSpec{
+		storage.SetJobInfo(co.JobSpec{
 			ID:        sn.ID,
 			OwnerRepo: job.ORL,
 		}, co.JobInfo{
@@ -404,7 +395,7 @@ func (c *CommanderSingle) collectRequestInfo(w http.ResponseWriter, r *http.Requ
 	slog.Debug("Collecting session info")
 
 	if r.Body == nil {
-		err := errors.New("Missing request body")
+		err := errors.New("missing request body")
 		log.Println(err)
 		http.Error(w, err.Error(), http.StatusNoContent)
 		return "", []co.OwnerRepo{}, "", err
@@ -447,8 +438,9 @@ func (c *CommanderSingle) collectRequestInfo(w http.ResponseWriter, r *http.Requ
 	for _, v := range msg.Repositories {
 		t := strings.Split(v, "/")
 		if len(t) != 2 {
-			slog.Error("Invalid owner / repository entry", "entry", t)
-			http.Error(w, err.Error(), http.StatusBadRequest)
+			err := "Invalid owner / repository entry"
+			slog.Error(err, "entry", t)
+			http.Error(w, err, http.StatusBadRequest)
 		}
 		session_repositories = append(session_repositories,
 			co.OwnerRepo{Owner: t[0], Repo: t[1]})
diff --git a/pkg/storage/storage.go b/pkg/storage/storage.go
index d077978..952c710 100644
--- a/pkg/storage/storage.go
+++ b/pkg/storage/storage.go
@@ -190,6 +190,12 @@ func GetJobInfo(js co.JobSpec) co.JobInfo {
 	return info[js]
 }
 
+func SetJobInfo(js co.JobSpec, ji co.JobInfo) {
+	mutex.Lock()
+	defer mutex.Unlock()
+	info[js] = ji
+}
+
 func GetStatus(sessionid int, orl co.OwnerRepo) co.Status {
 	mutex.Lock()
 	defer mutex.Unlock()