From fc29fc5653afe9fbe13aa15bc0d8afa76ac8cbe4 Mon Sep 17 00:00:00 2001
From: Michael Hohn <hohn@github.com>
Date: Tue, 11 Jun 2024 13:19:05 -0700
Subject: [PATCH] wip: update passing Queue to Commander

     - Add minio to docker-compose
     - Fix use of server.NewCommanderSingle
---
 README.md            | 11 ++++-------
 cmd/server/main.go   |  4 ++--
 docker-compose.yml   | 24 +++++++++++++++++++++---
 pkg/server/server.go |  2 +-
 pkg/server/types.go  |  6 ++----
 5 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/README.md b/README.md
index e368301..c476640 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,7 @@ These are simple steps using a single container.
         cd /mrva/mrvacommander/cmd/server/ && ./server
 
 ## Using docker-compose
-Steps to build and run the server in a multi-container environment set up by docker-compose.
+### Steps to build and run the server in a multi-container environment set up by docker-compose.
 
 1.  Build server on host
 
@@ -51,11 +51,8 @@ Steps to build and run the server in a multi-container environment set up by doc
         ./server -loglevel=debug -mode=container
 
 1.  Test server via remote client by following the steps in [gh-mrva](https://github.com/hohn/gh-mrva/blob/connection-redirect/README.org#compacted-edit-run-debug-cycle)
-    
 
-
-
-Some general docker-compose commands
+### Some general docker-compose commands
 
 2.  Get service status
 
@@ -76,7 +73,7 @@ Some general docker-compose commands
         curl -I http://rabbitmq:15672
 
 
-Some postgres specific commands
+### Some postgres specific commands
 
 1.  Access PostgreSQL
     
@@ -100,7 +97,7 @@ Some postgres specific commands
         \lo_import FILE [COMMENT]
 
 
-Manually create needed postgres databases
+### Manually create needed postgres databases
 
     # on the host
     psql -h localhost -p 5432 -U exampleuser -d postgres
diff --git a/cmd/server/main.go b/cmd/server/main.go
index adc0d44..0a89951 100644
--- a/cmd/server/main.go
+++ b/cmd/server/main.go
@@ -69,7 +69,7 @@ func main() {
 	case "standalone":
 		// Assemble single-process version
 		sq := queue.NewQueueSingle(2) // FIXME take value from configuration
-		sc := server.NewCommanderSingle(nil, sq)
+		sc := server.NewCommanderSingle()
 		sl := logger.NewLoggerSingle()
 		ss := storage.NewStorageSingle(config.Storage.StartingID)
 		sr := agent.NewRunnerSingle(2, sq) // FIXME take value from configuration
@@ -112,7 +112,7 @@ func main() {
 	case "container":
 		// Assemble container version
 		sq := queue.NewQueueSingle(2) // FIXME take value from configuration
-		sc := server.NewCommanderSingle(nil, sq)
+		sc := server.NewCommanderSingle()
 		sl := logger.NewLoggerSingle()
 
 		ss, err := storage.NewStorageContainer(config.Storage.StartingID)
diff --git a/docker-compose.yml b/docker-compose.yml
index e21143c..3620c1a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -47,10 +47,28 @@ services:
     networks:
       - backend
 
+  minio:
+    image: minio/minio:RELEASE.2024-06-11T03-13-30Z
+    container_name: minio
+    ports:
+      - "9000:9000"
+      - "9001:9001"
+    environment:
+      MINIO_ROOT_USER: user
+      MINIO_ROOT_PASSWORD: musty-coke
+    command: server /data --console-address ":9001"
+    volumes:
+      - minio-data:/data
+
+volumes:
+  minio-data:
+  postgres_data:
+    driver: local
+
 networks:
   backend:
     driver: bridge
     
-volumes:
-  postgres_data:
-    driver: local
+
+
+
diff --git a/pkg/server/server.go b/pkg/server/server.go
index f8365a9..312af2b 100644
--- a/pkg/server/server.go
+++ b/pkg/server/server.go
@@ -286,7 +286,7 @@ func (c *CommanderSingle) MirvaRequest(w http.ResponseWriter, r *http.Request) {
 
 	not_found_repos, analysisRepos := c.st.ServerStore.FindAvailableDBs(session_repositories)
 
-	c.queue.StartAnalyses(analysisRepos, session_id, session_language)
+	c.st.Queue.StartAnalyses(analysisRepos, session_id, session_language)
 
 	si := SessionInfo{
 		ID:             session_id,
diff --git a/pkg/server/types.go b/pkg/server/types.go
index 0fea515..0f221e9 100644
--- a/pkg/server/types.go
+++ b/pkg/server/types.go
@@ -26,12 +26,10 @@ type SessionInfo struct {
 
 type CommanderSingle struct {
 	st *CommanderVisibles
-	// TODO remove:
-	queue queue.Queue
 }
 
-func NewCommanderSingle(s *CommanderVisibles, q queue.Queue) *CommanderSingle {
-	c := CommanderSingle{s, q}
+func NewCommanderSingle() *CommanderSingle {
+	c := CommanderSingle{}
 	return &c
 }