update dbhandler

api/responsibleHandler.go

@@ -56,7 +56,7 @@ func (a *APIHandler) GetResponsible(c *gin.Context) {
 		}
 	}
 
-	members, err := a.DbHandler.GetResponsible(uint(i))
+	responsibles, err := a.DbHandler.GetResponsible(uint(i))
 	if err != nil {
 		a.logger.Error("GetResponsible", err)
 		c.JSON(http.StatusBadRequest, gin.H{
@@ -64,7 +64,7 @@ func (a *APIHandler) GetResponsible(c *gin.Context) {
 		})
 		return
 	}
-	c.JSON(http.StatusOK, members)
+	c.JSON(http.StatusOK, responsibles)
 }
 
 func (a *APIHandler) DeleteResponsible(c *gin.Context) {

go.mod

@@ -3,7 +3,7 @@ module gitea.tecamino.com/paadi/memberDB
 go 1.24.5
 
 require (
-	gitea.tecamino.com/paadi/dbHandler v1.1.6
+	gitea.tecamino.com/paadi/dbHandler v1.1.9
 	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.1.6 h1:Mz7ioUmozXx22oV3P7GHsvQn/2QKOjkNyzdptvqbaN8=
+gitea.tecamino.com/paadi/dbHandler v1.1.9 h1:B0sXVMYfjI1CQB2tX/aF+NoMeC0vlGhKs9MEYWf3oe8=
-gitea.tecamino.com/paadi/dbHandler v1.1.6/go.mod h1:y/xn/POJg1DO++67uKvnO23lJQgh+XFQq7HZCS9Getw=
+gitea.tecamino.com/paadi/dbHandler v1.1.9/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

@@ -12,7 +12,7 @@ func (dh *DatabaseHandler) StartNewEvent(event *models.Event) error {
 		return errors.New("database not opened")
 	}
 
-	if 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")
 	}
 
@@ -21,12 +21,18 @@ func (dh *DatabaseHandler) StartNewEvent(event *models.Event) error {
 	return dh.database.AddNewColum(&event)
 }
 
-func (dh *DatabaseHandler) GetEvent(id uint) (event []models.Event, err error) {
+func (dh *DatabaseHandler) GetEvent(id uint) (events []models.Event, err error) {
 	if !dh.DatabaseOpened() {
-		return event, errors.New("database not opened")
+		return events, errors.New("database not opened")
 	}
 
-	err = dh.database.GetById(&event, "Attendees", id)
+	err = dh.database.GetById(&events, id, "Attendees")
+
+	for i := range events {
+		for j := range events[i].Attendees {
+			events[i].Attendees[j].Decrypt(dh.token)
+		}
+	}
 	if err != nil {
 		return
 	}
@@ -37,7 +43,14 @@ 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))
+
+	if event.Date != "" {
+		event.Day, err = utils.GetDayFromDate(event.Date)
+		if err != nil {
+			return err
+		}
+	}
+	return dh.database.UpdateValuesById(&event, uint(event.Id))
 }
 
 func (dh *DatabaseHandler) DeleteEvent(ids ...uint) error {
@@ -58,14 +71,14 @@ func (dh *DatabaseHandler) AddAttendeesToEvent(newEvent models.Event) error {
 	}
 
 	var event models.Event
-	err := dh.database.GetById(&event, "Attendees", uint(newEvent.Id))
+	err := dh.database.GetById(&event, uint(newEvent.Id), "Attendees")
 	if err != nil {
 		return err
 	}
 
 next:
 	for _, newAttendee := range newEvent.Attendees {
-		if !dh.database.Exists(&models.Member{}, "", "id", newAttendee.Id, false) {
+		if !dh.database.Exists(&models.Member{}, "id", newAttendee.Id, false) {
 			continue
 		}
 		for _, attendee := range event.Attendees {
@@ -84,10 +97,11 @@ func (dh *DatabaseHandler) DeleteAttendeesFromEvent(newEvent models.Event) error
 	}
 
 	var event models.Event
-	dh.database.GetById(&event, "Attendees", uint(newEvent.Id))
+	dh.database.GetById(&event, uint(newEvent.Id), "Attendees")
 
 	for _, newAttendee := range newEvent.Attendees {
 		for _, a := range event.Attendees {
+			a.Decrypt(dh.token)
 			if a.FirstName == newAttendee.FirstName && a.LastName == newAttendee.LastName {
 				dh.database.DeleteRelation(&event, a, "Attendees")
 			}

handlers/group.go

@@ -11,7 +11,7 @@ func (dh *DatabaseHandler) NewGroup(group *models.Group) error {
 		return errors.New("database not opened")
 	}
 
-	if dh.database.Exists(&models.Group{}, "", "name", group.Name, false) {
+	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)
@@ -22,18 +22,18 @@ func (dh *DatabaseHandler) GetGroup(id uint) (group []models.Group, err error) {
 		return group, errors.New("database not opened")
 	}
 
-	err = dh.database.GetById(&group, "", id)
+	err = dh.database.GetById(&group, id)
 	if err != nil {
 		return
 	}
 	return
 }
 
-func (dh *DatabaseHandler) UpdateGroup(id int, group models.Group) (err error) {
+func (dh *DatabaseHandler) UpdateGroup(id uint, group models.Group) (err error) {
 	if !dh.DatabaseOpened() {
 		return errors.New("database not opened")
 	}
-	return dh.database.UpdateValuesById(&group, "", uint(group.Id))
+	return dh.database.UpdateValuesById(&group, uint(group.Id))
 }
 
 func (dh *DatabaseHandler) DeleteGroup(ids ...uint) error {

handlers/members.go

@@ -4,7 +4,6 @@ import (
 	"errors"
 	"fmt"
 
-	"gitea.tecamino.com/paadi/memberDB/crypto"
 	"gitea.tecamino.com/paadi/memberDB/models"
 	"gitea.tecamino.com/paadi/memberDB/utils"
 )
@@ -66,111 +65,54 @@ func (dh *DatabaseHandler) GetMember(id uint) (members []models.Member, err erro
 		return members, errors.New("database not opened")
 	}
 
-	err = dh.database.GetById(&members, "", id)
+	err = dh.database.GetById(&members, id, "Group", "Responsible", "Responsible.Member", "Events")
 	if err != nil {
 		return
 	}
 
+	//map for list all decrypted members so it only once derypt each member
+	decryptedList := make(map[uint]bool, 1)
 	for i := range members {
 		if err := members[i].Decrypt(dh.token); err != nil {
 			return members, err
 		}
+		if members[i].Responsible != nil {
+			//check if already decrypted
+			if decryptedList[members[i].Responsible.Member.Id] {
+				continue
+			}
+			members[i].Responsible.Member.Decrypt(dh.token)
+			decryptedList[members[i].Responsible.Member.Id] = true
+		}
 	}
 	return
 }
 
 // UpdateMember updates/overrides all information given meber id
-func (dh *DatabaseHandler) UpdateMember(id int, member models.Member) (err error) {
+func (dh *DatabaseHandler) UpdateMember(id uint, member models.Member) (err error) {
 	if !dh.DatabaseOpened() {
 		return errors.New("database not opened")
 	}
 
-	if member.FirstName != "" {
-		member.FirstNameHash = dh.hashField(member.FirstName)
-		member.FirstName, err = crypto.Encrypt(member.FirstName, dh.token)
-		if err != nil {
-			return
-		}
-	}
-
-	if member.LastName != "" {
-		member.LastNameHash = dh.hashField(member.LastName)
-		member.LastName, err = crypto.Encrypt(member.LastName, dh.token)
-		if err != nil {
-			return
-		}
-	}
-
 	//check correct birtday format
-	if member.Birthday != "" && utils.IsValidBirthday(member.Birthday) {
+	if member.Birthday != "" && !utils.IsValidBirthday(member.Birthday) {
-		member.BirthdayHash = dh.hashField(member.BirthdayHash)
-		member.Birthday, err = crypto.Encrypt(member.Birthday, dh.token)
-		if err != nil {
-			return err
-		}
-	} else if member.Birthday != "" {
 		return errors.New("incorrect birthday format")
 	}
 
-	if member.Address != "" {
-		member.Address, err = crypto.Encrypt(member.Address, dh.token)
-		if err != nil {
-			return err
-		}
-	}
-
-	if member.Zip != "" {
-		member.Zip, err = crypto.Encrypt(member.Zip, dh.token)
-		if err != nil {
-			return err
-		}
-	}
-
-	if member.Town != "" {
-		member.Town, err = crypto.Encrypt(member.Town, dh.token)
-		if err != nil {
-			return err
-		}
-	}
-
-	if member.Phone != "" {
-		member.Phone, err = crypto.Encrypt(member.Phone, dh.token)
-		if err != nil {
-			return err
-		}
-	}
-
 	//check correct email format
-	if member.Email != "" && utils.IsValidEmail(member.Email) {
+	if member.Email != "" && !utils.IsValidEmail(member.Email) {
-		member.Email, err = crypto.Encrypt(member.Email, dh.token)
-		if err != nil {
-			return err
-		}
-	} else if member.Email != "" {
 		return errors.New("incorrect email format")
 	}
 
-	if member.FirstVisit != "" {
+	if member.Group != nil {
-		member.FirstVisit, err = crypto.Encrypt(member.FirstVisit, dh.token)
+		member.GroupId = &member.Group.Id
-		if err != nil {
-			return err
-		}
 	}
 
-	if member.LastVisit != "" {
+	if member.Responsible != nil {
-		member.LastVisit, err = crypto.Encrypt(member.LastVisit, dh.token)
+		member.ResponsibleId = &member.Responsible.Id
-		if err != nil {
-			return err
-		}
 	}
-
+	member.Encrypt(dh.token)
-	if member.Comment != "" {
+	return dh.database.UpdateValuesById(&member, uint(member.Id), "Group", "Responsible", "Responsible.Member")
-		member.Comment, err = crypto.Encrypt(member.Comment, dh.token)
-		if err != nil {
-			return err
-		}
-	}
-	return dh.database.UpdateValuesById(&member, "", uint(member.Id))
 }
 
 // memberExists helper to check wheter member already exists
@@ -180,7 +122,7 @@ func (dh *DatabaseHandler) memberExists(checkMember models.Member) (bool, error)
 	}
 
 	var members []models.Member
-	if !dh.database.Exists(&members, "", "birthdayHash", dh.hashField(checkMember.Birthday), false) {
+	if !dh.database.Exists(&members, "birthdayHash", dh.hashField(checkMember.Birthday), false) {
 		return false, nil
 	}
 

handlers/responsible.go

@@ -11,21 +11,29 @@ func (dh *DatabaseHandler) AddNewResponsible(responsibles ...models.Responsible)
 		return errors.New("database not opened")
 	}
 
-	for i := range responsibles {
+next:
-		if responsibles[i].MemberId == 0 && responsibles[i].Id != 0 {
+	for _, r := range responsibles {
-			responsibles[i].MemberId = responsibles[i].Id
-			responsibles[i].Id = 0
-		}
 
 		//check if member exists
-		if !dh.database.Exists(&models.Member{}, "", "id", &responsibles[i].MemberId, false) {
+		if !dh.database.Exists(&models.Member{}, "id", &r.MemberId, false) {
 			continue
 		}
 		// check if already exists
-		if dh.database.Exists(&models.Responsible{}, "Member", "id", &responsibles[i].MemberId, false) {
+		var oldResponsibles models.Responsibles
-			continue
+		err := dh.database.GetById(&oldResponsibles, 0, "Member")
+		if err != nil {
+			return err
 		}
-		err := dh.database.AddNewColum(&responsibles[i])
+
+		for _, oldR := range oldResponsibles {
+			if oldR.Member == nil {
+				continue
+			} else if oldR.Member.Id == r.MemberId {
+				continue next
+			}
+		}
+
+		err = dh.database.AddNewColum(&r)
 		if err != nil {
 			return err
 		}
@@ -34,21 +42,18 @@ func (dh *DatabaseHandler) AddNewResponsible(responsibles ...models.Responsible)
 	return nil
 }
 
-func (dh *DatabaseHandler) GetResponsible(id uint) (members []models.Member, err error) {
+func (dh *DatabaseHandler) GetResponsible(id uint) (responsibles models.Responsibles, err error) {
 	if !dh.DatabaseOpened() {
-		return members, errors.New("database not opened")
+		return responsibles, errors.New("database not opened")
 	}
 
-	var responsibles models.Responsibles
+	err = dh.database.GetById(&responsibles, id, "Member")
-	err = dh.database.GetById(&responsibles, "Member", id)
 
-	for _, r := range responsibles {
+	for i := range responsibles {
-
+		err := responsibles[i].Member.Decrypt(dh.token)
-		err := r.Member.Decrypt(dh.token)
 		if err != nil {
-			return members, err
+			return responsibles, err
 		}
-		members = append(members, *r.Member)
 	}
 	return
 }

models/event.go

@@ -5,5 +5,5 @@ type Event struct {
 	Name      string    `gorm:"column:name" json:"name"`
 	Date      string    `gorm:"column:date" json:"date"`
 	Day       string    `gorm:"column:day" json:"day"`
-	Attendees []*Member `gorm:"many2many:member_events;"`
+	Attendees []*Member `gorm:"many2many:member_events;constraint:OnDelete:CASCADE;" json:"attendees"`
 }

models/group.go

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

models/member.go

@@ -6,86 +6,106 @@ import (
 )
 
 type Member struct {
-	Id            int      `gorm:"primaryKey" json:"id,omitempty"`
+	Id            uint         `gorm:"primaryKey" json:"id,omitempty"`
-	FirstName     string   `gorm:"column:firstName" json:"firstName,omitempty"`
+	FirstName     string       `gorm:"column:firstName" json:"firstName,omitempty"`
-	FirstNameHash string   `gorm:"column:firstNameHash" json:"-"`
+	FirstNameHash string       `gorm:"column:firstNameHash" json:"-"`
-	LastName      string   `gorm:"column:lastName" json:"lastName,omitempty"`
+	LastName      string       `gorm:"column:lastName" json:"lastName,omitempty"`
-	LastNameHash  string   `gorm:"column:lastNameHash" json:"-"`
+	LastNameHash  string       `gorm:"column:lastNameHash" json:"-"`
-	Birthday      string   `gorm:"column:birthday" json:"birthday,omitempty"`
+	Birthday      string       `gorm:"column:birthday" json:"birthday,omitempty"`
-	BirthdayHash  string   `gorm:"column:birthdayHash" json:"-"`
+	BirthdayHash  string       `gorm:"column:birthdayHash" json:"-"`
-	Address       string   `gorm:"column:address" json:"address,omitempty"`
+	Address       string       `gorm:"column:address" json:"address,omitempty"`
-	Zip           string   `gorm:"column:zip" json:"zip,omitempty"`
+	Zip           string       `gorm:"column:zip" json:"zip,omitempty"`
-	Town          string   `gorm:"column:town" json:"town,omitempty"`
+	Town          string       `gorm:"column:town" json:"town,omitempty"`
-	Phone         string   `gorm:"column:phone" json:"phone,omitempty"`
+	Phone         string       `gorm:"column:phone" json:"phone,omitempty"`
-	Email         string   `gorm:"column:email" json:"email,omitempty"`
+	Email         string       `gorm:"column:email" json:"email,omitempty"`
-	FirstVisit    string   `gorm:"column:firstVisit" json:"firstVisit,omitempty"`
+	FirstVisit    string       `gorm:"column:firstVisit" json:"firstVisit,omitempty"`
-	LastVisit     string   `gorm:"column:lastVisit" json:"lastVisit,omitempty"`
+	LastVisit     string       `gorm:"column:lastVisit" json:"lastVisit,omitempty"`
-	GroupId       *int     `json:"GroupId,omitempty"`
+	GroupId       *uint        `json:"GroupId,omitempty"`
-	Group         *Group   `gorm:"foreignKey:GroupId" json:"group,omitempty"`
+	Group         *Group       `gorm:"foreignKey:GroupId;constraint:OnDelete:CASCADE;" json:"group,omitempty"`
-	ResponsibleId *int     `json:"ResponsibleId,omitempty"`
+	ResponsibleId *uint        `json:"ResponsibleId,omitempty"`
-	Responsible   *Member  `gorm:"foreignKey:ResponsibleId" json:"responsible,omitempty"`
+	Responsible   *Responsible `gorm:"foreignKey:ResponsibleId;references:Id" json:"responsible,omitempty"`
-	Comment       string   `gorm:"column:comment" json:"comment,omitempty"`
+	Comment       string       `gorm:"column:comment" json:"comment,omitempty"`
-	Events        []*Event `gorm:"many2many:member_events;" `
+	Events        []*Event     `gorm:"many2many:member_events;" `
 }
 
 func (m *Member) Encrypt(token []byte) (err error) {
-
+	if m.FirstName != "" {
-	m.FirstNameHash = utils.HashField(m.FirstName, token)
+		m.FirstNameHash = utils.HashField(m.FirstName, token)
-	m.FirstName, err = crypto.Encrypt(m.FirstName, token)
+		m.FirstName, err = crypto.Encrypt(m.FirstName, token)
-	if err != nil {
+		if err != nil {
-		return
+			return
+		}
+	}
+	if m.LastName != "" {
+		m.LastNameHash = utils.HashField(m.LastName, token)
+		m.LastName, err = crypto.Encrypt(m.LastName, token)
+		if err != nil {
+			return
+		}
 	}
 
-	m.LastNameHash = utils.HashField(m.LastName, token)
+	if m.Birthday != "" {
-	m.LastName, err = crypto.Encrypt(m.LastName, token)
+		m.BirthdayHash = utils.HashField(m.Birthday, token)
-	if err != nil {
+		m.Birthday, err = crypto.Encrypt(m.Birthday, token)
-		return
+		if err != nil {
+			return
+		}
 	}
 
-	m.BirthdayHash = utils.HashField(m.Birthday, token)
+	if m.Address != "" {
-	m.Birthday, err = crypto.Encrypt(m.Birthday, token)
+		m.Address, err = crypto.Encrypt(m.Address, token)
-	if err != nil {
+		if err != nil {
-		return
+			return
+		}
 	}
 
-	m.Address, err = crypto.Encrypt(m.Address, token)
+	if m.Zip != "" {
-	if err != nil {
+		m.Zip, err = crypto.Encrypt(m.Zip, token)
-		return
+		if err != nil {
+			return
+		}
 	}
 
-	m.Zip, err = crypto.Encrypt(m.Zip, token)
+	if m.Town != "" {
-	if err != nil {
+		m.Town, err = crypto.Encrypt(m.Town, token)
-		return
+		if err != nil {
+			return
+		}
 	}
 
-	m.Town, err = crypto.Encrypt(m.Town, token)
+	if m.Phone != "" {
-	if err != nil {
+		m.Phone, err = crypto.Encrypt(m.Phone, token)
-		return
+		if err != nil {
+			return
+		}
 	}
 
-	m.Phone, err = crypto.Encrypt(m.Phone, token)
+	if m.Email != "" {
-	if err != nil {
+		m.Email, err = crypto.Encrypt(m.Email, token)
-		return
+		if err != nil {
+			return
+		}
 	}
 
-	m.Email, err = crypto.Encrypt(m.Email, token)
+	if m.FirstVisit != "" {
-	if err != nil {
+		m.FirstVisit, err = crypto.Encrypt(m.FirstVisit, token)
-		return
+		if err != nil {
+			return
+		}
 	}
 
-	m.FirstVisit, err = crypto.Encrypt(m.FirstVisit, token)
+	if m.LastVisit != "" {
-	if err != nil {
+		m.LastVisit, err = crypto.Encrypt(m.LastVisit, token)
-		return
+		if err != nil {
+			return
+		}
 	}
 
-	m.LastVisit, err = crypto.Encrypt(m.LastVisit, token)
+	if m.Comment != "" {
-	if err != nil {
+		m.Comment, err = crypto.Encrypt(m.Comment, token)
-		return
+		if err != nil {
-	}
+			return
-
+		}
-	m.Comment, err = crypto.Encrypt(m.Comment, token)
-	if err != nil {
-		return
 	}
 	return
 }

models/responsible.go

@@ -1,9 +1,9 @@
 package models
 
 type Responsible struct {
-	Id       uint `gorm:"primaryKey"`
+	Id       uint    `gorm:"primaryKey" json:"id"`
-	MemberId uint
+	MemberId uint    `json:"memberId"`
-	Member   *Member `gorm:"foreignKey:MemberId"`
+	Member   *Member `gorm:"foreignKey:MemberId;constraint:OnDelete:CASCADE;" json:"member"`
 }
 
 type Responsibles []Responsible

utils/utils.go

@@ -38,6 +38,11 @@ func GetCurrentDay(loc *time.Location) string {
 	return fmt.Sprint(time.Now().In(loc).Weekday())
 }
 
+func GetDayFromDate(dateTime string) (string, error) {
+	t, err := time.Parse("2006-01-02 15:04:05", dateTime)
+	return fmt.Sprint(t.Weekday()), err
+}
+
 func HashField(field string, token []byte) string {
 	h := hmac.New(sha256.New, token)
 	h.Write([]byte(field))