Merge pull request #38 from CS3219-AY2425S1/update-dockerisation

Update file structure and docker-compose
CS3219-AY2425S1 · Oct 5, 2024 · 145f4d6 · 145f4d6
2 parents 9f18e19 + 98ffbbd
commit 145f4d6
Show file tree

Hide file tree

Showing 28 changed files with 269 additions and 254 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/backend/.DS_Store b/backend/.DS_Store
diff --git a/...end/question-service/backend/.env.example → backend/question-service/.env.example b/...end/question-service/backend/.env.example → backend/question-service/.env.example
diff --git a/backend/question-service/backend/.gitignore → backend/question-service/.gitignore b/backend/question-service/backend/.gitignore → backend/question-service/.gitignore
diff --git a/backend/question-service/backend/Dockerfile → backend/question-service/Dockerfile b/backend/question-service/backend/Dockerfile → backend/question-service/Dockerfile
diff --git a/backend/question-service/README.md b/backend/question-service/README.md
@@ -1,8 +1 @@
-[![Review Assignment Due Date](https://classroom.github.com/assets/deadline-readme-button-22041afd0340ce965d47ae6ef1cefeee28c7c493a6346c4f15d667ab976d596c.svg)](https://classroom.github.com/a/bzPrOe11)
-# CS3219 Project (PeerPrep) - AY2425S1
-## Group: Gxx
-
-### Note: 
-- You can choose to develop individual microservices within separate folders within this repository **OR** use individual repositories (all public) for each microservice. 
-- In the latter scenario, you should enable sub-modules on this GitHub classroom repository to manage the development/deployment **AND** add your mentor to the individual repositories as a collaborator. 
-- The teaching team should be given access to the repositories as we may require viewing the history of the repository in case of any disputes or disagreements. 
+Backend services
diff --git a/backend/question-service/backend/.DS_Store b/backend/question-service/backend/.DS_Store
diff --git a/backend/question-service/backend/README.md b/backend/question-service/backend/README.md
diff --git a/backend/question-service/backend/package-lock.json b/backend/question-service/backend/package-lock.json
diff --git a/backend/question-service/backend/cmd/main.go → backend/question-service/cmd/main.go b/backend/question-service/backend/cmd/main.go → backend/question-service/cmd/main.go
@@ -7,8 +7,8 @@ import (
 	"os"
 	"time"
 
-	"backend/internal/controllers"
-	"backend/internal/routes"
+	"question-service/internal/controllers"
+	"question-service/internal/routes"
 
 	"github.com/gorilla/mux"
 	"github.com/gorilla/handlers"

diff --git a/...end/question-service/backend/config/db.go → backend/question-service/config/db.go b/...end/question-service/backend/config/db.go → backend/question-service/config/db.go
diff --git a/backend/question-service/backend/go.mod → backend/question-service/go.mod b/backend/question-service/backend/go.mod → backend/question-service/go.mod
@@ -1,4 +1,4 @@
-module backend
+module question-service
 
 go 1.23
 

diff --git a/backend/question-service/backend/go.sum → backend/question-service/go.sum b/backend/question-service/backend/go.sum → backend/question-service/go.sum
@@ -1,12 +1,10 @@
 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/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
 github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
 github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
 github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
 github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 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/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/gorilla/handlers v1.5.1 h1:9lRY6j8DEeeBT10CvO9hGW0gmky0BprnvDI5vfhUHH4=

diff --git a/...nd/internal/controllers/createQuestion.go → ...ce/internal/controllers/createQuestion.go b/...nd/internal/controllers/createQuestion.go → ...ce/internal/controllers/createQuestion.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 	"time"
 
-	"backend/internal/models"
+	"question-service/internal/models"
 
 	"github.com/google/uuid"
 	"go.mongodb.org/mongo-driver/bson"

diff --git a/...nd/internal/controllers/deleteQuestion.go → ...ce/internal/controllers/deleteQuestion.go b/...nd/internal/controllers/deleteQuestion.go → ...ce/internal/controllers/deleteQuestion.go
diff --git a/...nd/internal/controllers/getAllQuestion.go → ...ce/internal/controllers/getAllQuestion.go b/...nd/internal/controllers/getAllQuestion.go → ...ce/internal/controllers/getAllQuestion.go
@@ -6,7 +6,7 @@ import (
     "log"
     "net/http"
     "strconv"
-	"backend/internal/models"
+	"question-service/internal/models"
 
     "go.mongodb.org/mongo-driver/bson"
     "go.mongodb.org/mongo-driver/mongo/options"

diff --git a/...d/internal/controllers/getQuestionById.go → ...e/internal/controllers/getQuestionById.go b/...d/internal/controllers/getQuestionById.go → ...e/internal/controllers/getQuestionById.go
@@ -5,7 +5,7 @@ import (
 	"encoding/json"
 	"log"
 	"net/http"
-	"backend/internal/models"
+	"question-service/internal/models"
 
 	"github.com/google/uuid"
 	"github.com/gorilla/mux"

diff --git a/...nd/internal/controllers/updateQuestion.go → ...ce/internal/controllers/updateQuestion.go b/...nd/internal/controllers/updateQuestion.go → ...ce/internal/controllers/updateQuestion.go
diff --git a/.../backend/internal/models/questionModel.go → ...-service/internal/models/questionModel.go b/.../backend/internal/models/questionModel.go → ...-service/internal/models/questionModel.go
diff --git a/...backend/internal/routes/questionRoutes.go → ...service/internal/routes/questionRoutes.go b/...backend/internal/routes/questionRoutes.go → ...service/internal/routes/questionRoutes.go
@@ -1,7 +1,7 @@
 package routes
 
 import (
-	"backend/internal/controllers"
+	"question-service/internal/controllers"
 
 	"github.com/gorilla/mux"
 )