add new handlers for event and responsible tables

api/api.go

@@ -29,9 +29,11 @@ func NewAPI(host string, port int) *API {
 	apiHandler := NewAPIHandler()
 
 	v1 := r.Group("v1")
-	v1.GET("/members", apiHandler.GetMemberById)
 	v1.GET("/events", apiHandler.GetEventById)
 	v1.GET("/events/new", apiHandler.StartNewEvent)
+	v1.GET("/events/delete", apiHandler.DeleteEvent)
+	v1.GET("/members", apiHandler.GetMemberById)
+	v1.GET("/responsible", apiHandler.GetResponsibleById)
 
 	v1.POST("/database/open", apiHandler.OpenDatabase)
 	v1.POST("/members/add", apiHandler.AddNewMember)
@@ -39,6 +41,12 @@ func NewAPI(host string, port int) *API {
 	v1.POST("/members/delete", apiHandler.DeleteMember)
 	v1.POST("/members/import/csv", apiHandler.ImportCSV)
 
+	v1.POST("/events/attendees/add", apiHandler.AddNewAttendees)
+	v1.POST("/events/attendees/delete", apiHandler.DeleteAttendee)
+
+	v1.POST("/responsible/add", apiHandler.AddNewResponsible)
+	v1.POST("/responsible/delete", apiHandler.DeleteResponsible)
+
 	return &API{host: host,
 		port:   port,
 		router: r,

api/apiHandler.go

@@ -50,7 +50,14 @@ func (a *APIHandler) OpenDatabase(c *gin.Context) {
 		return
 	}
 
-	if err := a.DbHandler.CreateNewAttendanceTable(); err != nil {
+	if err := a.DbHandler.CreateNewEventTable(); err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{
+			"message": err.Error(),
+		})
+		return
+	}
+
+	if err := a.DbHandler.CreateNewResponsibleTable(); err != nil {
 		c.JSON(http.StatusBadRequest, gin.H{
 			"message": err.Error(),
 		})
@@ -71,6 +78,7 @@ func (a *APIHandler) OpenDatabase(c *gin.Context) {
 	})
 }
 
+// databaseOpened is a helper function to first check wheter database is open for requests
 func (a *APIHandler) databaseOpened(c *gin.Context) bool {
 	if a.DbHandler == nil {
 		c.JSON(http.StatusBadRequest, gin.H{

api/attendanceHandler.go

@@ -1,63 +0,0 @@
-package api
-
-import (
-	"net/http"
-	"strconv"
-
-	"github.com/gin-gonic/gin"
-)
-
-func (a *APIHandler) StartNewEvent(c *gin.Context) {
-	if !a.databaseOpened(c) {
-		return
-	}
-
-	name := c.Query("name")
-	if name == "" {
-		c.JSON(http.StatusBadRequest, gin.H{
-			"message": "missing query 'name'",
-		})
-		return
-	}
-
-	if err := a.DbHandler.StartNewEvent(name); err != nil {
-		c.JSON(http.StatusBadRequest, gin.H{
-			"message": err.Error(),
-		})
-		return
-	}
-
-	c.JSON(http.StatusOK, gin.H{
-		"message": "New Event added " + name,
-	})
-}
-
-func (a *APIHandler) GetEventById(c *gin.Context) {
-	if !a.databaseOpened(c) {
-		return
-	}
-
-	var i int
-	var err error
-
-	id := c.Query("id")
-	if id != "" {
-		i, err = strconv.Atoi(id)
-		if err != nil {
-			c.JSON(http.StatusBadRequest, gin.H{
-				"message": err.Error(),
-			})
-			return
-		}
-	}
-
-	events, err := a.DbHandler.GetEvent(i)
-	if err != nil {
-		c.JSON(http.StatusBadRequest, gin.H{
-			"message": err.Error(),
-		})
-		return
-	}
-
-	c.JSON(http.StatusOK, events)
-}

api/eventHandler.go

@@ -0,0 +1,148 @@
+package api
+
+import (
+	"net/http"
+	"strconv"
+
+	"gitea.tecamino.com/paadi/memberDB/models"
+	"github.com/gin-gonic/gin"
+)
+
+func (a *APIHandler) StartNewEvent(c *gin.Context) {
+	if !a.databaseOpened(c) {
+		return
+	}
+
+	name := c.Query("name")
+	if name == "" {
+		c.JSON(http.StatusBadRequest, gin.H{
+			"message": "missing query 'name'",
+		})
+		return
+	}
+
+	if err := a.DbHandler.StartNewEvent(name); err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{
+			"message": err.Error(),
+		})
+		return
+	}
+
+	c.JSON(http.StatusOK, gin.H{
+		"message": "New Event added " + name,
+	})
+}
+
+func (a *APIHandler) GetEventById(c *gin.Context) {
+	if !a.databaseOpened(c) {
+		return
+	}
+
+	var i int
+	var err error
+
+	id := c.Query("id")
+	if id != "" {
+		i, err = strconv.Atoi(id)
+		if err != nil {
+			c.JSON(http.StatusBadRequest, gin.H{
+				"message": err.Error(),
+			})
+			return
+		}
+	}
+
+	events, err := a.DbHandler.GetEvent(i)
+	if err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{
+			"message": err.Error(),
+		})
+		return
+	}
+
+	c.JSON(http.StatusOK, events)
+}
+
+func (a *APIHandler) DeleteEvent(c *gin.Context) {
+	if !a.databaseOpened(c) {
+		return
+	}
+	var err error
+
+	var request struct {
+		Ids []int `json:"ids"`
+	}
+	err = c.BindJSON(&request)
+	if err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{
+			"message": err.Error(),
+		})
+		return
+	}
+
+	err = a.DbHandler.DeleteEvent(request.Ids...)
+	if err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{
+			"message": err.Error(),
+		})
+		return
+	}
+	c.JSON(http.StatusOK, gin.H{
+		"message": "event deleted",
+	})
+}
+
+func (a *APIHandler) AddNewAttendees(c *gin.Context) {
+	if !a.databaseOpened(c) {
+		return
+	}
+
+	var event models.Event
+	err := c.BindJSON(&event)
+	if err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{
+			"message": err.Error(),
+		})
+		return
+	}
+
+	err = a.DbHandler.AddAttendeesToEvent(event)
+	if err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{
+			"message": err.Error(),
+		})
+		return
+	}
+
+	c.JSON(http.StatusOK, gin.H{
+		"message": "attendee(s) added",
+	})
+}
+
+func (a *APIHandler) DeleteAttendee(c *gin.Context) {
+	if !a.databaseOpened(c) {
+		return
+	}
+	var err error
+
+	var event models.Event
+	err = c.BindJSON(&event)
+	if err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{
+			"message": err.Error(),
+		})
+		return
+	}
+
+	err = a.DbHandler.DeleteAttendeesFromEvent(event)
+	if err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{
+			"message": err.Error(),
+		})
+		return
+	}
+
+	c.JSON(http.StatusOK, gin.H{
+		"message": "attendee(s) deleted",
+	})
+}

api/membersHandler.go

@@ -21,7 +21,13 @@ func (a *APIHandler) AddNewMember(c *gin.Context) {
 	}
 
 	var member models.Member
-	c.BindJSON(&member)
+	err := c.BindJSON(&member)
+	if err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{
+			"message": err.Error(),
+		})
+		return
+	}
 
 	var text string
 	if member.FirstName == "" {
@@ -40,7 +46,7 @@ func (a *APIHandler) AddNewMember(c *gin.Context) {
 		return
 	}
 
-	err := a.DbHandler.AddNewMember(member)
+	err = a.DbHandler.AddNewMember(member)
 	if err != nil {
 		c.JSON(http.StatusBadRequest, gin.H{
 			"message": err.Error(),
@@ -107,7 +113,13 @@ func (a *APIHandler) EditMember(c *gin.Context) {
 	}
 
 	var member models.Member
-	c.BindJSON(&member)
+	err = c.BindJSON(&member)
+	if err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{
+			"message": err.Error(),
+		})
+		return
+	}
 
 	err = a.DbHandler.UpdateMember(i, member)
 	if err != nil {

api/responsibleHandler.go

@@ -0,0 +1,95 @@
+package api
+
+import (
+	"net/http"
+	"strconv"
+
+	"gitea.tecamino.com/paadi/memberDB/models"
+
+	"github.com/gin-gonic/gin"
+)
+
+func (a *APIHandler) AddNewResponsible(c *gin.Context) {
+	if !a.databaseOpened(c) {
+		return
+	}
+
+	var responsible models.Person
+	err := c.BindJSON(&responsible)
+	if err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{
+			"message": err.Error(),
+		})
+		return
+	}
+
+	err = a.DbHandler.AddNewResponsible(responsible)
+	if err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{
+			"message": err.Error(),
+		})
+		return
+	}
+
+	c.JSON(http.StatusOK, gin.H{
+		"message": "responsible added",
+	})
+}
+
+func (a *APIHandler) GetResponsibleById(c *gin.Context) {
+	if !a.databaseOpened(c) {
+		return
+	}
+
+	var i int
+	var err error
+
+	id := c.Query("id")
+	if id != "" {
+		i, err = strconv.Atoi(id)
+		if err != nil {
+			c.JSON(http.StatusBadRequest, gin.H{
+				"message": err.Error(),
+			})
+			return
+		}
+	}
+
+	members, err := a.DbHandler.GetResponsible(i)
+	if err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{
+			"message": err.Error(),
+		})
+		return
+	}
+	c.JSON(http.StatusOK, members)
+}
+
+func (a *APIHandler) DeleteResponsible(c *gin.Context) {
+	if !a.databaseOpened(c) {
+		return
+	}
+	var err error
+
+	var request struct {
+		Ids []int `json:"ids"`
+	}
+	err = c.BindJSON(&request)
+	if err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{
+			"message": err.Error(),
+		})
+		return
+	}
+
+	err = a.DbHandler.DeleteResponsible(request.Ids...)
+	if err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{
+			"message": err.Error(),
+		})
+		return
+	}
+	c.JSON(http.StatusOK, gin.H{
+		"message": "responsible(s) deleted",
+	})
+}