Compare commits
12 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8400f29f7e | ||
|
|
4d86d9a8a0 | ||
|
|
c94f47060d | ||
|
|
5832df28c9 | ||
|
|
55653d996b | ||
|
|
b0895aee01 | ||
|
|
f28a3edbcf | ||
|
|
1d203d1d2f | ||
|
|
2f539c254b | ||
|
|
8e8a6d58aa | ||
|
|
3b804ff8d1 | ||
|
|
11b9c61113 |
@@ -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) {
|
||||
|
||||
2
go.mod
2
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.10
|
||||
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
|
||||
|
||||
4
go.sum
4
go.sum
@@ -1,5 +1,5 @@
|
||||
gitea.tecamino.com/paadi/dbHandler v1.1.6 h1:Mz7ioUmozXx22oV3P7GHsvQn/2QKOjkNyzdptvqbaN8=
|
||||
gitea.tecamino.com/paadi/dbHandler v1.1.6/go.mod h1:y/xn/POJg1DO++67uKvnO23lJQgh+XFQq7HZCS9Getw=
|
||||
gitea.tecamino.com/paadi/dbHandler v1.1.10 h1:zZQbDTJ0bu6CIW90Zms8yYIzTLHtWPNhVKRxLUXEDuE=
|
||||
gitea.tecamino.com/paadi/dbHandler v1.1.10/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=
|
||||
|
||||
@@ -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")
|
||||
}
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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"
|
||||
)
|
||||
@@ -24,86 +23,21 @@ func (dh *DatabaseHandler) AddNewMember(members ...models.Member) error {
|
||||
return fmt.Errorf("member %s %s %s exists already", member.FirstName, member.LastName, member.Birthday)
|
||||
}
|
||||
|
||||
encFirstName, err := crypto.Encrypt(member.FirstName, dh.token)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
encLastName, err := crypto.Encrypt(member.LastName, dh.token)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
//check correct birtday format
|
||||
if member.Birthday != "" && !utils.IsValidBirthday(member.Birthday) {
|
||||
return errors.New("incorrect birthday format")
|
||||
}
|
||||
|
||||
encBirthday, err := crypto.Encrypt(member.Birthday, dh.token)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
encAddress, err := crypto.Encrypt(member.Address, dh.token)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
encZip, err := crypto.Encrypt(member.Zip, dh.token)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
encTown, err := crypto.Encrypt(member.Town, dh.token)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
encPhone, err := crypto.Encrypt(member.Phone, dh.token)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
//check correct email format
|
||||
if member.Email != "" && !utils.IsValidEmail(member.Email) {
|
||||
return errors.New("incorrect email format")
|
||||
}
|
||||
|
||||
encEmail, err := crypto.Encrypt(member.Email, dh.token)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
now := utils.GetCurrentTime(dh.timeLocation)
|
||||
encFirstVisit, err := crypto.Encrypt(now, dh.token)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
member.FirstVisit = now
|
||||
member.LastVisit = now
|
||||
|
||||
encLastVisit, err := crypto.Encrypt(now, dh.token)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
encComment, err := crypto.Encrypt(member.Comment, dh.token)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
member.FirstNameHash = dh.hashField(member.FirstName)
|
||||
member.FirstName = encFirstName
|
||||
member.LastNameHash = dh.hashField(member.LastName)
|
||||
member.LastName = encLastName
|
||||
member.BirthdayHash = dh.hashField(member.Birthday)
|
||||
member.Birthday = encBirthday
|
||||
member.Address = encAddress
|
||||
member.Zip = encZip
|
||||
member.Town = encTown
|
||||
member.Phone = encPhone
|
||||
member.Email = encEmail
|
||||
member.FirstVisit = encFirstVisit
|
||||
member.LastVisit = encLastVisit
|
||||
member.Comment = encComment
|
||||
member.Encrypt(dh.token)
|
||||
|
||||
err = dh.database.AddNewColum(&member)
|
||||
if err != nil {
|
||||
@@ -131,184 +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 members[i].FirstName != "" {
|
||||
members[i].FirstName, err = crypto.Decrypt(members[i].FirstName, dh.token)
|
||||
if err != nil {
|
||||
return
|
||||
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
|
||||
}
|
||||
|
||||
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].Comment != "" {
|
||||
members[i].Comment, err = crypto.Decrypt(members[i].Comment, dh.token)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
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) {
|
||||
member.BirthdayHash = dh.hashField(member.BirthdayHash)
|
||||
member.Birthday, err = crypto.Encrypt(member.Birthday, dh.token)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
} else if member.Birthday != "" {
|
||||
if member.Birthday != "" && !utils.IsValidBirthday(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) {
|
||||
member.Email, err = crypto.Encrypt(member.Email, dh.token)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
} else if member.Email != "" {
|
||||
if member.Email != "" && !utils.IsValidEmail(member.Email) {
|
||||
return errors.New("incorrect email format")
|
||||
}
|
||||
|
||||
if member.FirstVisit != "" {
|
||||
member.FirstVisit, err = crypto.Encrypt(member.FirstVisit, dh.token)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if member.Group != nil {
|
||||
member.GroupId = &member.Group.Id
|
||||
}
|
||||
|
||||
if member.LastVisit != "" {
|
||||
member.LastVisit, err = crypto.Encrypt(member.LastVisit, dh.token)
|
||||
if err != nil {
|
||||
return err
|
||||
if member.Responsible != nil {
|
||||
member.ResponsibleId = &member.Responsible.Id
|
||||
}
|
||||
}
|
||||
|
||||
if member.Comment != "" {
|
||||
member.Comment, err = crypto.Encrypt(member.Comment, dh.token)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
return dh.database.UpdateValuesById(&member, "", uint(member.Id))
|
||||
member.Encrypt(dh.token)
|
||||
return dh.database.UpdateValuesById(&member, uint(member.Id), "Group", "Responsible", "Responsible.Member")
|
||||
}
|
||||
|
||||
// memberExists helper to check wheter member already exists
|
||||
@@ -318,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
|
||||
}
|
||||
|
||||
|
||||
@@ -11,12 +11,29 @@ func (dh *DatabaseHandler) AddNewResponsible(responsibles ...models.Responsible)
|
||||
return errors.New("database not opened")
|
||||
}
|
||||
|
||||
for i := range responsibles {
|
||||
if !dh.database.Exists(&models.Member{}, "", "id", 25, false) {
|
||||
next:
|
||||
for _, r := range responsibles {
|
||||
|
||||
//check if member exists
|
||||
if !dh.database.Exists(&models.Member{}, "id", &r.MemberId, false) {
|
||||
continue
|
||||
}
|
||||
// check if already exists
|
||||
var oldResponsibles models.Responsibles
|
||||
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
|
||||
}
|
||||
@@ -30,7 +47,14 @@ func (dh *DatabaseHandler) GetResponsible(id uint) (responsibles models.Responsi
|
||||
return responsibles, errors.New("database not opened")
|
||||
}
|
||||
|
||||
err = dh.database.GetById(&responsibles, "Member", id)
|
||||
err = dh.database.GetById(&responsibles, id, "Member")
|
||||
|
||||
for i := range responsibles {
|
||||
err := responsibles[i].Member.Decrypt(dh.token)
|
||||
if err != nil {
|
||||
return responsibles, err
|
||||
}
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
|
||||
@@ -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"`
|
||||
}
|
||||
|
||||
@@ -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"`
|
||||
}
|
||||
|
||||
178
models/member.go
178
models/member.go
@@ -1,7 +1,12 @@
|
||||
package models
|
||||
|
||||
import (
|
||||
"gitea.tecamino.com/paadi/memberDB/crypto"
|
||||
"gitea.tecamino.com/paadi/memberDB/utils"
|
||||
)
|
||||
|
||||
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"`
|
||||
FirstNameHash string `gorm:"column:firstNameHash" json:"-"`
|
||||
LastName string `gorm:"column:lastName" json:"lastName,omitempty"`
|
||||
@@ -15,10 +20,173 @@ type Member struct {
|
||||
Email string `gorm:"column:email" json:"email,omitempty"`
|
||||
FirstVisit string `gorm:"column:firstVisit" json:"firstVisit,omitempty"`
|
||||
LastVisit string `gorm:"column:lastVisit" json:"lastVisit,omitempty"`
|
||||
GroupId *int `json:"GroupId,omitempty"`
|
||||
Group *Group `gorm:"foreignKey:GroupId" json:"group,omitempty"`
|
||||
ResponsibleId *int `json:"ResponsibleId,omitempty"`
|
||||
Responsible *Member `gorm:"foreignKey:ResponsibleId" json:"responsible,omitempty"`
|
||||
GroupId *uint `json:"GroupId,omitempty"`
|
||||
Group *Group `gorm:"foreignKey:GroupId;constraint:OnDelete:CASCADE;" json:"group,omitempty"`
|
||||
ResponsibleId *uint `json:"ResponsibleId,omitempty"`
|
||||
Responsible *Responsible `gorm:"foreignKey:ResponsibleId;references:Id" json:"responsible,omitempty"`
|
||||
Comment string `gorm:"column:comment" json:"comment,omitempty"`
|
||||
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.FirstName, err = crypto.Encrypt(m.FirstName, token)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
}
|
||||
if m.LastName != "" {
|
||||
m.LastNameHash = utils.HashField(m.LastName, token)
|
||||
m.LastName, err = crypto.Encrypt(m.LastName, token)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
if m.Birthday != "" {
|
||||
m.BirthdayHash = utils.HashField(m.Birthday, token)
|
||||
m.Birthday, err = crypto.Encrypt(m.Birthday, token)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
if m.Address != "" {
|
||||
m.Address, err = crypto.Encrypt(m.Address, token)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
if m.Zip != "" {
|
||||
m.Zip, err = crypto.Encrypt(m.Zip, token)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
if m.Town != "" {
|
||||
m.Town, err = crypto.Encrypt(m.Town, token)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
if m.Phone != "" {
|
||||
m.Phone, err = crypto.Encrypt(m.Phone, token)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
if m.Email != "" {
|
||||
m.Email, err = crypto.Encrypt(m.Email, token)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
if m.FirstVisit != "" {
|
||||
m.FirstVisit, err = crypto.Encrypt(m.FirstVisit, token)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
if m.LastVisit != "" {
|
||||
m.LastVisit, err = crypto.Encrypt(m.LastVisit, token)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
if m.Comment != "" {
|
||||
m.Comment, err = crypto.Encrypt(m.Comment, token)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
func (m *Member) Decrypt(token []byte) (err error) {
|
||||
|
||||
if m.FirstName != "" {
|
||||
m.FirstName, err = crypto.Decrypt(m.FirstName, token)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
if m.LastName != "" {
|
||||
m.LastName, err = crypto.Decrypt(m.LastName, token)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
if m.Birthday != "" {
|
||||
m.Birthday, err = crypto.Decrypt(m.Birthday, token)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
if m.Address != "" {
|
||||
m.Address, err = crypto.Decrypt(m.Address, token)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
if m.Zip != "" {
|
||||
m.Zip, err = crypto.Decrypt(m.Zip, token)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
if m.Town != "" {
|
||||
m.Town, err = crypto.Decrypt(m.Town, token)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
if m.Phone != "" {
|
||||
m.Phone, err = crypto.Decrypt(m.Phone, token)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
if m.Email != "" {
|
||||
m.Email, err = crypto.Decrypt(m.Email, token)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
if m.FirstVisit != "" {
|
||||
m.FirstVisit, err = crypto.Decrypt(m.FirstVisit, token)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
if m.LastVisit != "" {
|
||||
m.LastVisit, err = crypto.Decrypt(m.LastVisit, token)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
if m.Comment != "" {
|
||||
m.Comment, err = crypto.Decrypt(m.Comment, token)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
9
models/responsible.go
Normal file
9
models/responsible.go
Normal file
@@ -0,0 +1,9 @@
|
||||
package models
|
||||
|
||||
type Responsible struct {
|
||||
Id uint `gorm:"primaryKey" json:"id"`
|
||||
MemberId uint `json:"memberId"`
|
||||
Member *Member `gorm:"foreignKey:MemberId;constraint:OnDelete:CASCADE;" json:"member"`
|
||||
}
|
||||
|
||||
type Responsibles []Responsible
|
||||
@@ -1,6 +1,9 @@
|
||||
package utils
|
||||
|
||||
import (
|
||||
"crypto/hmac"
|
||||
"crypto/sha256"
|
||||
"encoding/hex"
|
||||
"fmt"
|
||||
"net/mail"
|
||||
"time"
|
||||
@@ -34,3 +37,14 @@ func GetCurrentTime(loc *time.Location) string {
|
||||
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))
|
||||
return hex.EncodeToString(h.Sum(nil))
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user