pause endpoint framework added (#10)

backend functionality set up

pause functionality set up

cleaned up pause session function

unpause architecture set up

restart functionality finished

test: 💍 handlePause and handleUnpause

Author: patrickjfl

README.md

@@ -38,6 +38,7 @@ To run the server locally
   * `scripts/deploy.sh $VERSION_NUMBER` - Deploys any changes to kubernetes manifests, builds a new docker image, pushes it to docker hub and finally scales the deployment to pull the newly created image.
   * `scripts/deploy_kubernetes_config.sh` - Deploys just kubernetes manifest changes (kubernetes secret is excluded from the script).
   * `scripts/push_docker.sh $VERSION_NUMBER` - Builds and pushes the code to dockerhub with a $VERSION_NUMBER as a tag.
+  * `go test -v ./...` - Runs all tests
 
 ## Deployment
 

http-routes/http-routes.go

@@ -1,22 +1,23 @@
 package httproutes
 
 import (
-	"log"
 	"encoding/json"
+	"log"
 	"net/http"
+
 	"github.com/gorilla/websocket"
-	"github.com/jaskaransarkaria/programming-timer-server/session"
 	"github.com/jaskaransarkaria/programming-timer-server/readers"
+	"github.com/jaskaransarkaria/programming-timer-server/session"
 	"github.com/jaskaransarkaria/programming-timer-server/utils"
 )
 
 var upgrader = websocket.Upgrader{
 	// empty struct means use defaults
-	ReadBufferSize: 1024,
+	ReadBufferSize:  1024,
 	WriteBufferSize: 1024,
 }
 
-func enableCors(w *http.ResponseWriter) {(*w).Header().Set("Access-Control-Allow-Origin", "*")}
+func enableCors(w *http.ResponseWriter) { (*w).Header().Set("Access-Control-Allow-Origin", "*") }
 
 func wsEndpoint(w http.ResponseWriter, r *http.Request) {
 	// this is for CORS -  allow all origin
@@ -42,24 +43,53 @@ func updateSessionEndpoint(w http.ResponseWriter, r *http.Request) {
 	session.UpdateTimerChannel <- sessionToUpdate
 }
 
+func pauseSessionEndpoint(w http.ResponseWriter, r *http.Request) {
+	var sessionToPause session.PauseRequest
+	var requestBody = r.Body
+	log.Println("request body", requestBody)
+	enableCors(&w)
+	err := json.NewDecoder(requestBody).Decode(&sessionToPause)
+	log.Println("pause session endpoint reached", sessionToPause)
+	if err != nil {
+		log.Println(err)
+	}
+	defer r.Body.Close()
+	session.PauseTimerChannel <- sessionToPause
+}
+
+func unpauseSessionEndpoint(w http.ResponseWriter, r *http.Request) {
+	var sessionToUnpause session.UnpauseRequest
+	var requestBody = r.Body
+	log.Println("request body", requestBody)
+	enableCors(&w)
+	err := json.NewDecoder(requestBody).Decode(&sessionToUnpause)
+	log.Println("unpause session endpoint reached", sessionToUnpause)
+	if err != nil {
+		log.Println(err)
+	}
+	defer r.Body.Close()
+	session.UnpauseTimerChannel <- sessionToUnpause
+}
+
 func newSessionEndpoint(w http.ResponseWriter, r *http.Request) {
 	var timerRequest session.StartTimerReq
 	var requestBody = r.Body
+	log.Println(requestBody)
 	enableCors(&w)
 	err := json.NewDecoder(requestBody).Decode(&timerRequest)
 	if err != nil {
 		log.Println(err)
 	}
 	defer r.Body.Close()
-	newUser := session.User{ UUID: utils.GenerateRandomID("user") }
+	newUser := session.User{UUID: utils.GenerateRandomID("user")}
 	newSession := session.CreateNewUserAndSession(
 		timerRequest,
-		newUser, 
+		newUser,
 		utils.GenerateRandomID,
 	)
 	resp := session.InitSessionResponse{
-		Session: newSession, 
-		User: newUser,
+		Session: newSession,
+		User:    newUser,
 	}
 	newSessionRes, _ := json.Marshal(resp)
 	w.Write(newSessionRes)
@@ -74,22 +104,22 @@ func joinSessionEndpoint(w http.ResponseWriter, r *http.Request) {
 		log.Println(err)
 	}
 	defer r.Body.Close()
-	var newUser = session.User{ UUID: utils.GenerateRandomID("user") }
+	var newUser = session.User{UUID: utils.GenerateRandomID("user")}
 	matchedSession, err := session.JoinExistingSession(sessionRequest, newUser)
 	if err != nil {
 		bufferedErr, _ := json.Marshal(err)
 		w.Write(bufferedErr)
 	}
 	resp := session.InitSessionResponse{
-		Session: matchedSession, 
-		User: newUser,
+		Session: matchedSession,
+		User:    newUser,
 	}
 	bufferedExistingSession, _ := json.Marshal(resp)
 	w.Write(bufferedExistingSession)
 }
 
 func SetupRoutes() {
-	http.HandleFunc("/healthz", func (w http.ResponseWriter, r *http.Request) {
+	http.HandleFunc("/healthz", func(w http.ResponseWriter, r *http.Request) {
 		w.WriteHeader(200)
 		w.Write([]byte("ok"))
 	})
@@ -98,4 +128,8 @@ func SetupRoutes() {
 	http.HandleFunc("/session/join", joinSessionEndpoint)
 	http.HandleFunc("/session/update", updateSessionEndpoint)
 	go readers.UpdateChannelReader()
+	http.HandleFunc("/session/pause", pauseSessionEndpoint)
+	go readers.PauseChannelReader()
+	http.HandleFunc("/session/unpause", unpauseSessionEndpoint)
+	go readers.UnpauseChannelReader()
 }

main.go

@@ -1,12 +1,14 @@
 package main
 
 import (
-	"github.com/jaskaransarkaria/programming-timer-server/http-routes"
+	"flag"
 	"fmt"
-	"net/http"
 	"log"
-	"flag"
+	"net/http"
+
+	httproutes "github.com/jaskaransarkaria/programming-timer-server/http-routes"
 )
+
 // flag allows you to create cli flags and assign a default
 var addr = flag.String("addr", "0.0.0.0:8080", "http service address")
 

readers/readers.go

@@ -2,6 +2,7 @@ package readers
 
 import (
 	"log"
+
 	"github.com/gorilla/websocket"
 	"github.com/jaskaransarkaria/programming-timer-server/session"
 )
@@ -18,7 +19,7 @@ func ConnReader(conn *websocket.Conn) {
 			}
 			conn.Close()
 			break
-			} else {
+		} else {
 			log.Println(string(p))
 			addToSessionErr := session.AddUserConnToSession(string(p), conn)
 			if addToSessionErr != nil {
@@ -31,7 +32,23 @@ func ConnReader(conn *websocket.Conn) {
 // UpdateChannelReader handle updates to sessions
 func UpdateChannelReader() {
 	for {
-		recievedUpdate := <- session.UpdateTimerChannel
+		recievedUpdate := <-session.UpdateTimerChannel
 		session.HandleUpdateSession(recievedUpdate)
 	}
 }
+
+//PauseChannelReader handles pause requests
+func PauseChannelReader() {
+	for {
+		pauseRequest := <-session.PauseTimerChannel
+		session.HandlePauseSession(pauseRequest)
+	}
+}
+
+//UnpauseChannelReader handles restart requests
+func UnpauseChannelReader() {
+	for {
+		unpauseRequest := <-session.UnpauseTimerChannel
+		session.HandleUnpauseSession(unpauseRequest)
+	}
+}