Merge "Callback to delete job"

[nonrtric.git] / dmaap-mediator-producer / internal / server / server.go

diff --git a/dmaap-mediator-producer/internal/server/server.go b/dmaap-mediator-producer/internal/server/server.go
index c3a1331..d07b730 100644 (file)
--- a/dmaap-mediator-producer/internal/server/server.go
+++ b/dmaap-mediator-producer/internal/server/server.go
@@ -26,34 +26,28 @@ import (
        "io/ioutil"
        "net/http"
 
+       "github.com/gorilla/mux"
        "oransc.org/nonrtric/dmaapmediatorproducer/internal/jobs"
 )
 
-func StatusHandler(w http.ResponseWriter, r *http.Request) {
-       if r.URL.Path != "/" {
-               http.Error(w, "404 not found.", http.StatusNotFound)
-               return
-       }
-
-       if r.Method != "GET" {
-               http.Error(w, "Method is not supported.", http.StatusMethodNotAllowed)
-               return
-       }
+const StatusPath = "/status"
+const AddJobPath = "/jobs"
+const jobIdToken = "infoJobId"
+const deleteJobPath = AddJobPath + "/{" + jobIdToken + "}"
 
-       fmt.Fprintf(w, "All is well!")
+func NewRouter() *mux.Router {
+       r := mux.NewRouter()
+       r.HandleFunc(StatusPath, statusHandler).Methods(http.MethodGet).Name("status")
+       r.HandleFunc(AddJobPath, addInfoJobHandler).Methods(http.MethodPost).Name("add")
+       r.HandleFunc(deleteJobPath, deleteInfoJobHandler).Methods(http.MethodDelete).Name("delete")
+       r.NotFoundHandler = &notFoundHandler{}
+       r.MethodNotAllowedHandler = &methodNotAllowedHandler{}
+       return r
 }
 
-func CreateInfoJobHandler(w http.ResponseWriter, r *http.Request) {
-       if r.URL.Path != "/producer_simulator/info_job" {
-               http.Error(w, "404 not found.", http.StatusNotFound)
-               return
-       }
-
-       if r.Method != "POST" {
-               http.Error(w, "Method is not supported.", http.StatusMethodNotAllowed)
-               return
-       }
+func statusHandler(w http.ResponseWriter, r *http.Request) {}
 
+func addInfoJobHandler(w http.ResponseWriter, r *http.Request) {
        b, readErr := ioutil.ReadAll(r.Body)
        if readErr != nil {
                http.Error(w, fmt.Sprintf("Unable to read body due to: %v", readErr), http.StatusBadRequest)
@@ -69,13 +63,25 @@ func CreateInfoJobHandler(w http.ResponseWriter, r *http.Request) {
        }
 }
 
-func CreateServer(port int, handlerFunc func(http.ResponseWriter, *http.Request)) *http.Server {
-
-       mux := http.NewServeMux()
-       mux.HandleFunc("/", handlerFunc)
-       server := http.Server{
-               Addr:    fmt.Sprintf(":%v", port), // :{port}
-               Handler: mux,
+func deleteInfoJobHandler(w http.ResponseWriter, r *http.Request) {
+       vars := mux.Vars(r)
+       id, ok := vars[jobIdToken]
+       if !ok {
+               http.Error(w, "Must provide infoJobId.", http.StatusBadRequest)
+               return
        }
-       return &server
+
+       jobs.DeleteJob(id)
+}
+
+type notFoundHandler struct{}
+
+func (h *notFoundHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+       http.Error(w, "404 not found.", http.StatusNotFound)
+}
+
+type methodNotAllowedHandler struct{}
+
+func (h *methodNotAllowedHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+       http.Error(w, "Method is not supported.", http.StatusMethodNotAllowed)
 }