Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1d09705adb | ||
|
|
4ee558b340 | ||
|
|
ad44a65087 | ||
|
|
e3870de7d5 | ||
|
|
25f965cd72 |
@@ -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)
|
||||
|
||||
|
||||
@@ -114,7 +114,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 +146,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(),
|
||||
})
|
||||
|
||||
@@ -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",
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
@@ -57,7 +57,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 +74,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 +83,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 +95,5 @@ next:
|
||||
}
|
||||
}
|
||||
event.Count = len(event.Attendees)
|
||||
return dh.database.UpdateValuesById(&event, uint(event.Id))
|
||||
return dh.database.UpdateValuesById(&event, uint(newEvent.Id))
|
||||
}
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -136,7 +136,7 @@ func TestMemberDB(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)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user