commit fe61c6191ba72b1d8297264c3d61566ea23a70b6
author elinuxhenrik <henrik.b.andersson@est.tech> Fri Sep 24 15:08:47 2021 +0200
committer elinuxhenrik <henrik.b.andersson@est.tech> Mon Sep 27 10:58:14 2021 +0200
tree 32133cea6ab6b7406e48043ed0ce85ae84ad5087
parent b65d86fc9b02415e1adf2415f8c4a257378e9c09

Callback to delete job

Issue-ID: NONRTRIC-587
Signed-off-by: elinuxhenrik <henrik.b.andersson@est.tech>
Change-Id: I2bdca3fc648ea3a909a0a60c43504d5f80ee05bc

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 0b5e5b8..d07b730 100644
--- a/dmaap-mediator-producer/internal/server/server.go
+++ b/dmaap-mediator-producer/internal/server/server.go
@@ -26,37 +26,28 @@
 	"io/ioutil"
 	"net/http"
 
+	"github.com/gorilla/mux"
 	"oransc.org/nonrtric/dmaapmediatorproducer/internal/jobs"
 )
 
-const StatusCallbackPath = "/status"
-const JobsCallbackPath = "/jobs"
+const StatusPath = "/status"
+const AddJobPath = "/jobs"
+const jobIdToken = "infoJobId"
+const deleteJobPath = AddJobPath + "/{" + jobIdToken + "}"
 
-func StatusHandler(w http.ResponseWriter, r *http.Request) {
-	if r.URL.Path != StatusCallbackPath {
-		http.Error(w, "404 not found.", http.StatusNotFound)
-		return
-	}
-
-	if r.Method != "GET" {
-		http.Error(w, "Method is not supported.", http.StatusMethodNotAllowed)
-		return
-	}
-
-	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 != JobsCallbackPath {
-		http.Error(w, "404 not found.", http.StatusNotFound)
-		return
-	}
+func statusHandler(w http.ResponseWriter, r *http.Request) {}
 
-	if r.Method != "POST" {
-		http.Error(w, "Method is not supported.", http.StatusMethodNotAllowed)
-		return
-	}
-
+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)
@@ -71,3 +62,26 @@
 		http.Error(w, fmt.Sprintf("Invalid job info. Cause: %v", err), http.StatusBadRequest)
 	}
 }
+
+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
+	}
+
+	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)
+}