add new group table to database

api/apiHandler.go

@@ -91,6 +91,12 @@ func (a *APIHandler) OpenDatabase(c *gin.Context) {
 		return
 	}
 
+	if err := a.DbHandler.AddNewTable(&models.Group{}); err != nil {
+		a.logger.Error("OpenDatabase", err)
+		c.JSON(http.StatusInternalServerError, nil)
+		return
+	}
+
 	a.DbHandler.SetToken(database.Token)
 
 	c.JSON(http.StatusOK, gin.H{

api/groupHandler.go

@@ -0,0 +1,128 @@
+package api
+
+import (
+	"net/http"
+	"strconv"
+
+	"gitea.tecamino.com/paadi/memberDB/models"
+	"github.com/gin-gonic/gin"
+)
+
+func (a *APIHandler) NewGroup(c *gin.Context) {
+	if !a.DBHandlerIsInitialized() {
+		a.logger.Error("StartNewEvent", "database handler is not initialized")
+		c.JSON(http.StatusInternalServerError, nil)
+		return
+	}
+
+	var group models.Group
+	err := c.BindJSON(&group)
+	if err != nil {
+		a.logger.Error("NewGroup", err)
+		c.JSON(http.StatusInternalServerError, nil)
+		return
+	}
+
+	if err := a.DbHandler.NewGroup(&group); err != nil {
+		a.logger.Error("NewGroup", err)
+		c.JSON(http.StatusBadRequest, gin.H{"message": err.Error()})
+		return
+	}
+
+	c.JSON(http.StatusOK, gin.H{
+		"message": "New group added " + group.Name,
+	})
+}
+
+func (a *APIHandler) GetGroup(c *gin.Context) {
+	if !a.DBHandlerIsInitialized() {
+		a.logger.Error("GetGroup", "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("GetGroup", err)
+
+			c.JSON(http.StatusInternalServerError, nil)
+			return
+		}
+	}
+
+	groups, err := a.DbHandler.GetGroup(uint(i))
+	if err != nil {
+		a.logger.Error("GetGroup", err)
+		c.JSON(http.StatusBadRequest, nil)
+		return
+	}
+
+	c.JSON(http.StatusOK, groups)
+}
+
+func (a *APIHandler) UpdateGroup(c *gin.Context) {
+	if !a.DBHandlerIsInitialized() {
+		a.logger.Error("UpdateGroup", "database handler is not initialized")
+		c.JSON(http.StatusInternalServerError, nil)
+		return
+	}
+
+	var groups []models.Group
+	err := c.BindJSON(&groups)
+	if err != nil {
+		a.logger.Error("UpdateGroup", err)
+		c.JSON(http.StatusInternalServerError, nil)
+		return
+	}
+
+	for _, event := range groups {
+		err = a.DbHandler.UpdateGroup(event.Id, event)
+		if err != nil {
+			a.logger.Error("UpdateGroup", err)
+			c.JSON(http.StatusBadRequest, gin.H{
+				"message": err.Error(),
+			})
+			return
+		}
+	}
+	c.JSON(http.StatusOK, gin.H{
+		"message": "group(s) updated",
+	})
+}
+
+func (a *APIHandler) DeleteGroup(c *gin.Context) {
+	if !a.DBHandlerIsInitialized() {
+		a.logger.Error("DeleteGroup", "database handler is not initialized")
+		c.JSON(http.StatusInternalServerError, nil)
+		return
+	}
+
+	var err error
+
+	var request struct {
+		Ids []uint `json:"ids"`
+	}
+	err = c.BindJSON(&request)
+	if err != nil {
+		a.logger.Error("DeleteGroup", err)
+		c.JSON(http.StatusBadRequest, nil)
+		return
+	}
+
+	err = a.DbHandler.DeleteGroup(request.Ids...)
+	if err != nil {
+		a.logger.Error("DeleteGroup", err)
+		c.JSON(http.StatusBadRequest, gin.H{
+			"message": err.Error(),
+		})
+		return
+	}
+	c.JSON(http.StatusOK, gin.H{
+		"message": "group deleted",
+	})
+}

api/membersHandler.go

@@ -37,9 +37,7 @@ func (a *APIHandler) AddNewMember(c *gin.Context) {
 	if member.LastName == "" {
 		text += "lastName "
 	}
-	if member.Birthday == "" {
+
-		text += "birthday "
-	}
 	if text != "" {
 		a.logger.Error("AddNewMember", text+"can not be empty")
 		c.JSON(http.StatusBadRequest, gin.H{

api/responsibleHandler.go

@@ -24,14 +24,13 @@ func (a *APIHandler) AddNewResponsible(c *gin.Context) {
 		return
 	}
 
-	for _, responsible := range responsibles {
+	err = a.DbHandler.AddNewResponsible(responsibles...)
-		err = a.DbHandler.AddNewResponsible(responsible)
 	if err != nil {
 		c.JSON(http.StatusBadRequest, gin.H{
 			"message": err.Error(),
 		})
 		return
-		}
+
 	}
 
 	c.JSON(http.StatusOK, gin.H{

go.mod

@@ -3,7 +3,7 @@ module gitea.tecamino.com/paadi/memberDB
 go 1.24.5
 
 require (
-	gitea.tecamino.com/paadi/dbHandler v1.0.4
+	gitea.tecamino.com/paadi/dbHandler v1.0.8
 	gitea.tecamino.com/paadi/tecamino-logger v0.2.1
 	github.com/gin-contrib/cors v1.7.6
 	github.com/gin-gonic/gin v1.11.0

go.sum

@@ -1,5 +1,5 @@
-gitea.tecamino.com/paadi/dbHandler v1.0.4 h1:ctnaec0GDdtw3gRQdUISVDYLJ9x+vt50VW41OemfhD4=
+gitea.tecamino.com/paadi/dbHandler v1.0.8 h1:ZWSBM/KFtLwTv2cBqwK1mOxWAxAfL0BcWEC3kJ9JALU=
-gitea.tecamino.com/paadi/dbHandler v1.0.4/go.mod h1:y/xn/POJg1DO++67uKvnO23lJQgh+XFQq7HZCS9Getw=
+gitea.tecamino.com/paadi/dbHandler v1.0.8/go.mod h1:y/xn/POJg1DO++67uKvnO23lJQgh+XFQq7HZCS9Getw=
 gitea.tecamino.com/paadi/tecamino-logger v0.2.1 h1:sQTBKYPdzn9mmWX2JXZBtGBvNQH7cuXIwsl4TD0aMgE=
 gitea.tecamino.com/paadi/tecamino-logger v0.2.1/go.mod h1:FkzRTldUBBOd/iy2upycArDftSZ5trbsX5Ira5OzJgM=
 github.com/bytedance/sonic v1.14.0 h1:/OfKt8HFw0kh2rj8N0F6C/qPGRESq0BbaNZgcNXXzQQ=

handlers/events.go

@@ -13,7 +13,7 @@ func (dh *DatabaseHandler) StartNewEvent(event *models.Event) error {
 		return errors.New("database not opened")
 	}
 
-	if nil == dh.database.Exists(&models.Event{}, "name", event.Name, false) {
+	if dh.database.Exists(&models.Event{}, "name", event.Name, false) {
 		return errors.New("event with name: " + event.Name + " exists already")
 	}
 

handlers/group.go

@@ -0,0 +1,49 @@
+package handlers
+
+import (
+	"errors"
+
+	"gitea.tecamino.com/paadi/memberDB/models"
+)
+
+func (dh *DatabaseHandler) NewGroup(group *models.Group) error {
+	if !dh.DatabaseOpened() {
+		return errors.New("database not opened")
+	}
+
+	if dh.database.Exists(&models.Group{}, "name", group.Name, false) {
+		return errors.New("group with name: " + group.Name + " exists already")
+	}
+	return dh.database.AddNewColum(&group)
+}
+
+func (dh *DatabaseHandler) GetGroup(id uint) (group []models.Group, err error) {
+	if !dh.DatabaseOpened() {
+		return group, errors.New("database not opened")
+	}
+
+	err = dh.database.GetById(&group, id)
+	if err != nil {
+		return
+	}
+	return
+}
+
+func (dh *DatabaseHandler) UpdateGroup(id int, group models.Group) (err error) {
+	if !dh.DatabaseOpened() {
+		return errors.New("database not opened")
+	}
+	return dh.database.UpdateValuesById(&group, uint(group.Id))
+}
+
+func (dh *DatabaseHandler) DeleteGroup(ids ...uint) error {
+	if !dh.DatabaseOpened() {
+		return errors.New("database not opened")
+	}
+
+	if len(ids) == 0 {
+		return errors.New("no ids given to be deleted")
+	}
+
+	return dh.database.DeleteById(&models.Group{}, ids...)
+}

handlers/members.go

@@ -91,7 +91,7 @@ func (dh *DatabaseHandler) AddNewMember(members ...models.Member) error {
 			return err
 		}
 
-		encResponsiblePerson, err := crypto.Encrypt(member.ResponsiblePerson, dh.token)
+		encComment, err := crypto.Encrypt(member.Comment, dh.token)
 		if err != nil {
 			return err
 		}
@@ -110,7 +110,7 @@ func (dh *DatabaseHandler) AddNewMember(members ...models.Member) error {
 		member.FirstVisit = encFirstVisit
 		member.LastVisit = encLastVisit
 		member.Group = encGroup
-		member.ResponsiblePerson = encResponsiblePerson
+		member.Comment = encComment
 
 		err = dh.database.AddNewColum(&member)
 		if err != nil {
@@ -144,66 +144,90 @@ func (dh *DatabaseHandler) GetMember(id uint) (members []models.Member, err erro
 	}
 
 	for i := range members {
+		if members[i].FirstName != "" {
 			members[i].FirstName, err = crypto.Decrypt(members[i].FirstName, dh.token)
 			if err != nil {
 				return
 			}
+		}
 
+		if members[i].LastName != "" {
 			members[i].LastName, err = crypto.Decrypt(members[i].LastName, dh.token)
 			if err != nil {
 				return
 			}
+		}
 
+		if members[i].Birthday != "" {
 			members[i].Birthday, err = crypto.Decrypt(members[i].Birthday, dh.token)
 			if err != nil {
 				return
 			}
+		}
 
+		if members[i].Address != "" {
 			members[i].Address, err = crypto.Decrypt(members[i].Address, dh.token)
 			if err != nil {
 				return
 			}
+		}
 
+		if members[i].Zip != "" {
 			members[i].Zip, err = crypto.Decrypt(members[i].Zip, dh.token)
 			if err != nil {
 				return
 			}
+		}
 
+		if members[i].Town != "" {
 			members[i].Town, err = crypto.Decrypt(members[i].Town, dh.token)
 			if err != nil {
 				return
 			}
+		}
 
+		if members[i].Phone != "" {
 			members[i].Phone, err = crypto.Decrypt(members[i].Phone, dh.token)
 			if err != nil {
 				return
 			}
+		}
 
+		if members[i].Email != "" {
 			members[i].Email, err = crypto.Decrypt(members[i].Email, dh.token)
 			if err != nil {
 				return
 			}
+		}
 
+		if members[i].FirstVisit != "" {
 			members[i].FirstVisit, err = crypto.Decrypt(members[i].FirstVisit, dh.token)
 			if err != nil {
 				return
 			}
+		}
 
+		if members[i].LastVisit != "" {
 			members[i].LastVisit, err = crypto.Decrypt(members[i].LastVisit, dh.token)
 			if err != nil {
 				return
 			}
+		}
 
+		if members[i].Group != "" {
 			members[i].Group, err = crypto.Decrypt(members[i].Group, dh.token)
 			if err != nil {
 				return
 			}
+		}
 
-		members[i].ResponsiblePerson, err = crypto.Decrypt(members[i].ResponsiblePerson, dh.token)
+		if members[i].Comment != "" {
+			members[i].Comment, err = crypto.Decrypt(members[i].Comment, dh.token)
 			if err != nil {
 				return
 			}
 		}
+	}
 	return
 }
 
@@ -299,8 +323,8 @@ func (dh *DatabaseHandler) UpdateMember(id int, member models.Member) (err error
 		}
 	}
 
-	if member.ResponsiblePerson != "" {
+	if member.Comment != "" {
-		member.ResponsiblePerson, err = crypto.Encrypt(member.ResponsiblePerson, dh.token)
+		member.Comment, err = crypto.Encrypt(member.Comment, dh.token)
 		if err != nil {
 			return err
 		}
@@ -314,10 +338,16 @@ func (dh *DatabaseHandler) memberExists(checkMember models.Member) (bool, error)
 		return false, errors.New("database not opened")
 	}
 
-	var member models.Member
+	var members []models.Member
-	err := dh.database.Exists(&member, "birthdayHash", dh.hashField(checkMember.Birthday), false)
+	if !dh.database.Exists(&members, "birthdayHash", dh.hashField(checkMember.Birthday), false) {
-	if err != nil {
 		return false, nil
 	}
-	return dh.hashField(checkMember.FirstName) == member.FirstNameHash && dh.hashField(checkMember.LastName) == member.LastNameHash && dh.hashField(checkMember.Birthday) == member.BirthdayHash, nil
+
+	for _, member := range members {
+		if dh.hashField(checkMember.FirstName) == member.FirstNameHash && dh.hashField(checkMember.LastName) == member.LastNameHash && dh.hashField(checkMember.Birthday) == member.BirthdayHash {
+			return true, nil
+		}
+	}
+
+	return false, nil
 }

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
@@ -55,10 +54,15 @@ func (dh *DatabaseHandler) responsibleExists(CheckResponsible models.Person) (bo
 		return false, errors.New("database not opened")
 	}
 
-	var person models.Person
+	var persons []models.Person
-	err := dh.database.Exists(&person, "lastName", CheckResponsible.LastName, false)
+	if !dh.database.Exists(&persons, "lastName", CheckResponsible.LastName, false) {
-	if err != nil {
 		return false, nil
 	}
-	return person.FirstName == CheckResponsible.FirstName && person.LastName == CheckResponsible.LastName, nil
+
+	for _, person := range persons {
+		if person.FirstName == CheckResponsible.FirstName && person.LastName == CheckResponsible.LastName {
+			return true, nil
+		}
+	}
+	return false, nil
 }

models/group.go

@@ -0,0 +1,6 @@
+package models
+
+type Group struct {
+	Id   int    `gorm:"primaryKey" json:"id"`
+	Name string `gorm:"column:name" json:"name"`
+}

models/member.go

@@ -16,5 +16,6 @@ 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"`
+	Comment           string `gorm:"column:comment" json:"comment"`
 }

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)
+}