fix json error

api/api.go

@@ -41,7 +41,7 @@ func NewAPI(host string, port int, logger *logging.Logger) (*API, error) {
 
 	v1.POST("/database/open", apiHandler.OpenDatabase)
 	v1.POST("/members/add", apiHandler.AddNewMember)
-	v1.POST("/members/edit", apiHandler.EditMember)
+	v1.POST("/members/edit", apiHandler.UpdateMember)
 	v1.POST("/members/delete", apiHandler.DeleteMember)
 	v1.POST("/members/import/csv", apiHandler.ImportCSV)
 

api/eventHandler.go

@@ -15,22 +15,23 @@ func (a *APIHandler) StartNewEvent(c *gin.Context) {
 		return
 	}
 
-	name := c.Query("name")
-	if name == "" {
-		a.logger.Error("StartNewEvent", "missing query 'name'")
-
+	var event models.Event
+	err := c.BindJSON(&event)
+	if err != nil {
+		a.logger.Error("StartNewEvent", err)
 		c.JSON(http.StatusInternalServerError, nil)
 		return
 	}
 
-	if err := a.DbHandler.StartNewEvent(name); err != nil {
+	if err := a.DbHandler.StartNewEvent(&event); err != nil {
 		a.logger.Error("StartNewEvent", err)
 		c.JSON(http.StatusBadRequest, gin.H{"message": err.Error()})
 		return
 	}
 
 	c.JSON(http.StatusOK, gin.H{
-		"message": "New Event added " + name,
+		"message": "New Event added " + event.Name,
+		"data":    event,
 	})
 }
 
@@ -65,6 +66,36 @@ func (a *APIHandler) GetEvent(c *gin.Context) {
 	c.JSON(http.StatusOK, events)
 }
 
+func (a *APIHandler) UpdateEvent(c *gin.Context) {
+	if !a.DBHandlerIsInitialized() {
+		a.logger.Error("UpdateEvent", "database handler is not initialized")
+		c.JSON(http.StatusInternalServerError, nil)
+		return
+	}
+
+	var events []models.Event
+	err := c.BindJSON(&events)
+	if err != nil {
+		a.logger.Error("UpdateEvent", err)
+		c.JSON(http.StatusInternalServerError, nil)
+		return
+	}
+
+	for _, event := range events {
+		err = a.DbHandler.UpdateEvent(event.Id, event)
+		if err != nil {
+			a.logger.Error("UpdateEvent", err)
+			c.JSON(http.StatusBadRequest, gin.H{
+				"message": err.Error(),
+			})
+			return
+		}
+	}
+	c.JSON(http.StatusOK, gin.H{
+		"message": "event(s) updated",
+	})
+}
+
 func (a *APIHandler) DeleteEvent(c *gin.Context) {
 	if !a.DBHandlerIsInitialized() {
 		a.logger.Error("DeleteEvent", "database handler is not initialized")
@@ -114,7 +145,7 @@ func (a *APIHandler) AddNewAttendees(c *gin.Context) {
 
 	err = a.DbHandler.AddAttendeesToEvent(event)
 	if err != nil {
-		a.logger.Error("DeleteEvent", err)
+		a.logger.Error("AddNewAttendees", err)
 
 		c.JSON(http.StatusInternalServerError, gin.H{
 			"message": err.Error(),
@@ -146,7 +177,7 @@ func (a *APIHandler) DeleteAttendee(c *gin.Context) {
 
 	err = a.DbHandler.DeleteAttendeesFromEvent(event)
 	if err != nil {
-		a.logger.Error("DeleteAttendeesFromEvent", err)
+		a.logger.Error("DeleteAttendee", err)
 		c.JSON(http.StatusInternalServerError, gin.H{
 			"message": err.Error(),
 		})

api/membersHandler.go

@@ -93,50 +93,33 @@ func (a *APIHandler) GetMember(c *gin.Context) {
 	c.JSON(http.StatusOK, members)
 }
 
-func (a *APIHandler) EditMember(c *gin.Context) {
+func (a *APIHandler) UpdateMember(c *gin.Context) {
 	if !a.DBHandlerIsInitialized() {
 		a.logger.Error("EditMember", "database handler is not initialized")
 		c.JSON(http.StatusInternalServerError, nil)
 		return
 	}
 
-	var i int
-	var err error
-
-	id := c.Query("id")
-	if id != "" {
-		i, err = strconv.Atoi(id)
-		if err != nil {
-			a.logger.Error("EditMember", err)
-			c.JSON(http.StatusInternalServerError, nil)
-			return
-		}
-	} else {
-		a.logger.Error("EditMember", err)
-		c.JSON(http.StatusBadRequest, gin.H{
-			"message": "query parameter 'id' missing",
-		})
-		return
-	}
-
-	var member models.Member
-	err = c.BindJSON(&member)
+	var members []models.Member
+	err := c.BindJSON(&members)
 	if err != nil {
 		a.logger.Error("EditMember", err)
 		c.JSON(http.StatusInternalServerError, nil)
 		return
 	}
 
-	err = a.DbHandler.UpdateMember(i, member)
-	if err != nil {
-		a.logger.Error("EditMember", err)
-		c.JSON(http.StatusBadRequest, gin.H{
-			"message": err.Error(),
-		})
-		return
+	for _, member := range members {
+		err = a.DbHandler.UpdateMember(member.Id, member)
+		if err != nil {
+			a.logger.Error("EditMember", err)
+			c.JSON(http.StatusBadRequest, gin.H{
+				"message": err.Error(),
+			})
+			return
+		}
 	}
 	c.JSON(http.StatusOK, gin.H{
-		"message": "member updated",
+		"message": "member(s) updated",
 	})
 }
 

api/responsibleHandler.go

@@ -16,24 +16,25 @@ func (a *APIHandler) AddNewResponsible(c *gin.Context) {
 		return
 	}
 
-	var responsible models.Person
-	err := c.BindJSON(&responsible)
+	var responsibles []models.Person
+	err := c.BindJSON(&responsibles)
 	if err != nil {
 		a.logger.Error("AddNewResponsible", err)
 		c.JSON(http.StatusInternalServerError, nil)
 		return
 	}
 
-	err = a.DbHandler.AddNewResponsible(responsible)
+	err = a.DbHandler.AddNewResponsible(responsibles...)
 	if err != nil {
 		c.JSON(http.StatusBadRequest, gin.H{
 			"message": err.Error(),
 		})
 		return
+
 	}
 
 	c.JSON(http.StatusOK, gin.H{
-		"message": "responsible added",
+		"message": "responsible(s) added",
 	})
 }
 

handlers/events.go

@@ -8,19 +8,17 @@ import (
 	"gitea.tecamino.com/paadi/memberDB/models"
 )
 
-func (dh *DatabaseHandler) StartNewEvent(name string) error {
+func (dh *DatabaseHandler) StartNewEvent(event *models.Event) error {
 	if !dh.DatabaseOpened() {
 		return errors.New("database not opened")
 	}
 
-	if nil == dh.database.Exists(&models.Event{}, "name", name, false) {
-		return errors.New("event with name: " + name + " exists already")
+	if nil == dh.database.Exists(&models.Event{}, "name", event.Name, false) {
+		return errors.New("event with name: " + event.Name + " exists already")
 	}
 
-	return dh.database.AddNewColum(&models.Event{
-		Name: name,
-		Date: time.Now().Format("2006-01-02 15:04:05"),
-	})
+	event.Date = time.Now().Format("2006-01-02 15:04:05")
+	return dh.database.AddNewColum(&event)
 }
 
 func (dh *DatabaseHandler) GetEvent(id uint) (event []models.Event, err error) {
@@ -39,6 +37,13 @@ func (dh *DatabaseHandler) GetEvent(id uint) (event []models.Event, err error) {
 	return
 }
 
+func (dh *DatabaseHandler) UpdateEvent(id int, event models.Event) (err error) {
+	if !dh.DatabaseOpened() {
+		return errors.New("database not opened")
+	}
+	return dh.database.UpdateValuesById(&event, uint(event.Id))
+}
+
 func (dh *DatabaseHandler) DeleteEvent(ids ...uint) error {
 	if !dh.DatabaseOpened() {
 		return errors.New("database not opened")
@@ -57,7 +62,7 @@ func (dh *DatabaseHandler) AddAttendeesToEvent(newEvent models.Event) error {
 	}
 
 	var event models.Event
-	err := dh.database.GetById(&event, uint(event.Id))
+	err := dh.database.GetById(&event, uint(newEvent.Id))
 	if err != nil {
 		return err
 	}
@@ -74,7 +79,7 @@ next:
 
 	event.Count = len(event.Attendees)
 
-	return dh.database.UpdateValuesById(&event, uint(event.Id))
+	return dh.database.UpdateValuesById(&event, uint(newEvent.Id))
 }
 
 func (dh *DatabaseHandler) DeleteAttendeesFromEvent(newEvent models.Event) error {
@@ -83,7 +88,7 @@ func (dh *DatabaseHandler) DeleteAttendeesFromEvent(newEvent models.Event) error
 	}
 
 	var event models.Event
-	dh.database.GetById(&event, uint(event.Id))
+	dh.database.GetById(&event, uint(newEvent.Id))
 
 next:
 	for _, newAttendee := range newEvent.Attendees {
@@ -95,5 +100,5 @@ next:
 		}
 	}
 	event.Count = len(event.Attendees)
-	return dh.database.UpdateValuesById(&event, uint(event.Id))
+	return dh.database.UpdateValuesById(&event, uint(newEvent.Id))
 }

handlers/members.go

@@ -91,11 +91,6 @@ func (dh *DatabaseHandler) AddNewMember(members ...models.Member) error {
 			return err
 		}
 
-		encResponsiblePerson, err := crypto.Encrypt(member.ResponsiblePerson, dh.token)
-		if err != nil {
-			return err
-		}
-
 		member.FirstNameHash = dh.hashField(member.FirstName)
 		member.FirstName = encFirstName
 		member.LastNameHash = dh.hashField(member.LastName)
@@ -110,7 +105,6 @@ func (dh *DatabaseHandler) AddNewMember(members ...models.Member) error {
 		member.FirstVisit = encFirstVisit
 		member.LastVisit = encLastVisit
 		member.Group = encGroup
-		member.ResponsiblePerson = encResponsiblePerson
 
 		err = dh.database.AddNewColum(&member)
 		if err != nil {
@@ -198,11 +192,6 @@ func (dh *DatabaseHandler) GetMember(id uint) (members []models.Member, err erro
 		if err != nil {
 			return
 		}
-
-		members[i].ResponsiblePerson, err = crypto.Decrypt(members[i].ResponsiblePerson, dh.token)
-		if err != nil {
-			return
-		}
 	}
 	return
 }
@@ -298,13 +287,6 @@ func (dh *DatabaseHandler) UpdateMember(id int, member models.Member) (err error
 			return err
 		}
 	}
-
-	if member.ResponsiblePerson != "" {
-		member.ResponsiblePerson, err = crypto.Encrypt(member.ResponsiblePerson, dh.token)
-		if err != nil {
-			return err
-		}
-	}
 	return dh.database.UpdateValuesById(&member, uint(member.Id))
 }
 

handlers/responsible.go

@@ -10,11 +10,10 @@ func (dh *DatabaseHandler) AddNewResponsible(responsibles ...models.Person) erro
 	if !dh.DatabaseOpened() {
 		return errors.New("database not opened")
 	}
-	if !dh.DatabaseOpened() {
-		return errors.New("database not opened")
-	}
-	for _, responsible := range responsibles {
 
+	for _, responsible := range responsibles {
+		// set id to 0 so new uniq id is created
+		responsible.Id = 0
 		exists, err := dh.responsibleExists(responsible)
 		if err != nil {
 			return err

member_test.go

@@ -44,7 +44,7 @@ func TestErrors(t *testing.T) {
 
 	v1.POST("/database/open", apiHandler.OpenDatabase)
 	v1.POST("/members/add", apiHandler.AddNewMember)
-	v1.POST("/members/edit", apiHandler.EditMember)
+	v1.POST("/members/edit", apiHandler.UpdateMember)
 	v1.POST("/members/delete", apiHandler.DeleteMember)
 	v1.POST("/members/import/csv", apiHandler.ImportCSV)
 
@@ -129,19 +129,20 @@ func TestMemberDB(t *testing.T) {
 
 	v1 := r.Group("v1")
 	v1.GET("/events", apiHandler.GetEvent)
-	v1.GET("/events/new", apiHandler.StartNewEvent)
-	v1.GET("/events/delete", apiHandler.DeleteEvent)
 	v1.GET("/members", apiHandler.GetMember)
 	v1.GET("/responsible", apiHandler.GetResponsible)
 
 	v1.POST("/database/open", apiHandler.OpenDatabase)
 	v1.POST("/members/add", apiHandler.AddNewMember)
-	v1.POST("/members/edit", apiHandler.EditMember)
+	v1.POST("/members/edit", apiHandler.UpdateMember)
 	v1.POST("/members/delete", apiHandler.DeleteMember)
 	v1.POST("/members/import/csv", apiHandler.ImportCSV)
 
+	v1.POST("/events/new", apiHandler.StartNewEvent)
 	v1.POST("/events/attendees/add", apiHandler.AddNewAttendees)
 	v1.POST("/events/attendees/delete", apiHandler.DeleteAttendee)
+	v1.POST("/events/edit", apiHandler.UpdateEvent)
+	v1.POST("/events/delete", apiHandler.DeleteEvent)
 
 	v1.POST("/responsible/add", apiHandler.AddNewResponsible)
 	v1.POST("/responsible/delete", apiHandler.DeleteResponsible)

models/member.go

@@ -16,5 +16,5 @@ type Member struct {
 	FirstVisit        string `gorm:"column:firstVisit" json:"firstVisit,omitempty"`
 	LastVisit         string `gorm:"column:lastVisit" json:"lastVisit,omitempty"`
 	Group             string `gorm:"column:group" json:"group,omitempty"`
-	ResponsiblePerson string `gorm:"column:responsiblePerson" json:"responsiblePerson,omitempty"`
+	ResponsiblePerson Person `gorm:"type:json" json:"responsiblePerson"`
 }

models/person.go

@@ -8,12 +8,6 @@ import (
 
 type Persons []Person
 
-type Person struct {
-	Id        int    `gorm:"primaryKey" json:"id"`
-	FirstName string `gorm:"column:firstName" json:"firstName"`
-	LastName  string `gorm:"column:lastName" json:"lastName"`
-}
-
 // --- Implement driver.Valuer (for saving to DB)
 func (r Persons) Value() (driver.Value, error) {
 	return json.Marshal(r)
@@ -27,3 +21,23 @@ func (r *Persons) Scan(value any) error {
 	}
 	return json.Unmarshal(bytes, r)
 }
+
+type Person struct {
+	Id        int    `gorm:"primaryKey" json:"id"`
+	FirstName string `gorm:"column:firstName" json:"firstName"`
+	LastName  string `gorm:"column:lastName" json:"lastName"`
+}
+
+// --- Implement driver.Valuer (for saving to DB)
+func (r Person) Value() (driver.Value, error) {
+	return json.Marshal(r)
+}
+
+// --- Implement sql.Scanner (for reading from DB)
+func (r *Person) Scan(value any) error {
+	bytes, ok := value.([]byte)
+	if !ok {
+		return fmt.Errorf("failed to unmarshal Settings: %v", value)
+	}
+	return json.Unmarshal(bytes, r)
+}