From fe194754b17e229cda72c6b226f8462ff15d3748 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Z=C3=BCrcher?= Date: Thu, 20 Nov 2025 10:40:56 +0100 Subject: [PATCH] change table to references --- api/apiHandler.go | 6 +++++- api/responsibleHandler.go | 3 +-- go.mod | 2 +- go.sum | 4 ++-- handlers/database.go | 14 +++++++++++-- handlers/events.go | 43 ++++++++++++++++----------------------- handlers/group.go | 8 ++++---- handlers/members.go | 31 +++++----------------------- handlers/responsible.go | 40 ++++++++---------------------------- member_test.go | 19 +++++++++-------- models/event.go | 10 ++++----- models/member.go | 37 +++++++++++++++++---------------- models/person.go | 43 --------------------------------------- utils/utils.go | 9 ++++++++ 14 files changed, 101 insertions(+), 168 deletions(-) delete mode 100644 models/person.go diff --git a/api/apiHandler.go b/api/apiHandler.go index a0694fc..54fac40 100644 --- a/api/apiHandler.go +++ b/api/apiHandler.go @@ -73,6 +73,10 @@ func (a *APIHandler) OpenDatabase(c *gin.Context) { return } + if err := a.DbHandler.SetTimezone(os.Getenv("TIMEZONE")); err != nil { + a.logger.Error("OpenDatabase", err) + } + if err := a.DbHandler.AddNewTable(&models.Member{}); err != nil { a.logger.Error("OpenDatabase", err) c.JSON(http.StatusInternalServerError, nil) @@ -85,7 +89,7 @@ func (a *APIHandler) OpenDatabase(c *gin.Context) { return } - if err := a.DbHandler.AddNewTable(&models.Person{}); err != nil { + if err := a.DbHandler.AddNewTable(&models.Responsible{}); err != nil { a.logger.Error("OpenDatabase", err) c.JSON(http.StatusInternalServerError, nil) return diff --git a/api/responsibleHandler.go b/api/responsibleHandler.go index b8d8442..1d94a5b 100644 --- a/api/responsibleHandler.go +++ b/api/responsibleHandler.go @@ -16,7 +16,7 @@ func (a *APIHandler) AddNewResponsible(c *gin.Context) { return } - var responsibles []models.Person + var responsibles []models.Responsible err := c.BindJSON(&responsibles) if err != nil { a.logger.Error("AddNewResponsible", err) @@ -30,7 +30,6 @@ func (a *APIHandler) AddNewResponsible(c *gin.Context) { "message": err.Error(), }) return - } c.JSON(http.StatusOK, gin.H{ diff --git a/go.mod b/go.mod index 1b12eb4..b758e36 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module gitea.tecamino.com/paadi/memberDB go 1.24.5 require ( - gitea.tecamino.com/paadi/dbHandler v1.0.8 + gitea.tecamino.com/paadi/dbHandler v1.1.6 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 diff --git a/go.sum b/go.sum index e5ab790..09f6e87 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,5 @@ -gitea.tecamino.com/paadi/dbHandler v1.0.8 h1:ZWSBM/KFtLwTv2cBqwK1mOxWAxAfL0BcWEC3kJ9JALU= -gitea.tecamino.com/paadi/dbHandler v1.0.8/go.mod h1:y/xn/POJg1DO++67uKvnO23lJQgh+XFQq7HZCS9Getw= +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/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= diff --git a/handlers/database.go b/handlers/database.go index ac8afd7..3550e55 100644 --- a/handlers/database.go +++ b/handlers/database.go @@ -4,14 +4,16 @@ import ( "crypto/hmac" "crypto/sha256" "encoding/hex" + "time" "gitea.tecamino.com/paadi/dbHandler" "gitea.tecamino.com/paadi/tecamino-logger/logging" ) type DatabaseHandler struct { - database *dbHandler.DBHandler - token []byte + database *dbHandler.DBHandler + timeLocation *time.Location + token []byte } func NewDatabaseHandler(name, path string, logger *logging.Logger) (*DatabaseHandler, error) { @@ -23,6 +25,14 @@ func NewDatabaseHandler(name, path string, logger *logging.Logger) (*DatabaseHan return &DatabaseHandler{database: database}, nil } +func (dH *DatabaseHandler) SetTimezone(timezone string) (err error) { + if timezone == "" { + timezone = "Local" + } + dH.timeLocation, err = time.LoadLocation(timezone) + return +} + func (dH *DatabaseHandler) DatabaseOpened() bool { return dH.database != nil } diff --git a/handlers/events.go b/handlers/events.go index 6724d51..828359a 100644 --- a/handlers/events.go +++ b/handlers/events.go @@ -2,10 +2,9 @@ package handlers import ( "errors" - "slices" - "time" "gitea.tecamino.com/paadi/memberDB/models" + "gitea.tecamino.com/paadi/memberDB/utils" ) func (dh *DatabaseHandler) StartNewEvent(event *models.Event) error { @@ -13,11 +12,12 @@ 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") } - event.Date = time.Now().Format("2006-01-02 15:04:05") + event.Date = utils.GetCurrentTime(dh.timeLocation) + event.Day = utils.GetCurrentDay(dh.timeLocation) return dh.database.AddNewColum(&event) } @@ -26,14 +26,10 @@ func (dh *DatabaseHandler) GetEvent(id uint) (event []models.Event, err error) { return event, errors.New("database not opened") } - err = dh.database.GetById(&event, id) + err = dh.database.GetById(&event, "Attendees", id) if err != nil { return } - - for i := range event { - event[i].Count = len(event[i].Attendees) - } return } @@ -41,7 +37,7 @@ 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)) + return dh.database.UpdateValuesById(&event, "", uint(event.Id)) } func (dh *DatabaseHandler) DeleteEvent(ids ...uint) error { @@ -53,7 +49,7 @@ func (dh *DatabaseHandler) DeleteEvent(ids ...uint) error { return errors.New("no ids given to be deleted") } - return dh.database.DeleteById(&models.Event{}, ids...) + return dh.database.DeleteById(&models.Event{}, "", ids...) } func (dh *DatabaseHandler) AddAttendeesToEvent(newEvent models.Event) error { @@ -62,24 +58,24 @@ func (dh *DatabaseHandler) AddAttendeesToEvent(newEvent models.Event) error { } var event models.Event - err := dh.database.GetById(&event, uint(newEvent.Id)) + err := dh.database.GetById(&event, "Attendees", uint(newEvent.Id)) if err != nil { return err } next: for _, newAttendee := range newEvent.Attendees { + if !dh.database.Exists(&models.Member{}, "", "id", newAttendee.Id, false) { + continue + } for _, attendee := range event.Attendees { if attendee.FirstName == newAttendee.FirstName && attendee.LastName == newAttendee.LastName { continue next } } - event.Attendees = append(event.Attendees, newAttendee) + dh.database.AddRelation(&event, newAttendee, "Attendees") } - - event.Count = len(event.Attendees) - - return dh.database.UpdateValuesById(&event, uint(newEvent.Id)) + return nil } func (dh *DatabaseHandler) DeleteAttendeesFromEvent(newEvent models.Event) error { @@ -88,17 +84,14 @@ func (dh *DatabaseHandler) DeleteAttendeesFromEvent(newEvent models.Event) error } var event models.Event - dh.database.GetById(&event, uint(newEvent.Id)) + dh.database.GetById(&event, "Attendees", uint(newEvent.Id)) -next: for _, newAttendee := range newEvent.Attendees { - for i := range event.Attendees { - if event.Attendees[i].FirstName == newAttendee.FirstName && event.Attendees[i].LastName == newAttendee.LastName { - event.Attendees = slices.Delete(event.Attendees, i, i+1) - continue next + for _, a := range event.Attendees { + if a.FirstName == newAttendee.FirstName && a.LastName == newAttendee.LastName { + dh.database.DeleteRelation(&event, a, "Attendees") } } } - event.Count = len(event.Attendees) - return dh.database.UpdateValuesById(&event, uint(newEvent.Id)) + return nil } diff --git a/handlers/group.go b/handlers/group.go index 20e143c..20b4981 100644 --- a/handlers/group.go +++ b/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,7 +22,7 @@ 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 } @@ -33,7 +33,7 @@ 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)) + return dh.database.UpdateValuesById(&group, "", uint(group.Id)) } func (dh *DatabaseHandler) DeleteGroup(ids ...uint) error { @@ -45,5 +45,5 @@ func (dh *DatabaseHandler) DeleteGroup(ids ...uint) error { return errors.New("no ids given to be deleted") } - return dh.database.DeleteById(&models.Group{}, ids...) + return dh.database.DeleteById(&models.Group{}, "", ids...) } diff --git a/handlers/members.go b/handlers/members.go index e703fcd..21aeaca 100644 --- a/handlers/members.go +++ b/handlers/members.go @@ -3,7 +3,6 @@ package handlers import ( "errors" "fmt" - "time" "gitea.tecamino.com/paadi/memberDB/crypto" "gitea.tecamino.com/paadi/memberDB/models" @@ -75,7 +74,7 @@ func (dh *DatabaseHandler) AddNewMember(members ...models.Member) error { return err } - now := time.Now().Format("2006-01-02 15:04:05") + now := utils.GetCurrentTime(dh.timeLocation) encFirstVisit, err := crypto.Encrypt(now, dh.token) if err != nil { return err @@ -86,11 +85,6 @@ func (dh *DatabaseHandler) AddNewMember(members ...models.Member) error { return err } - encGroup, err := crypto.Encrypt(member.Group, dh.token) - if err != nil { - return err - } - encComment, err := crypto.Encrypt(member.Comment, dh.token) if err != nil { return err @@ -109,7 +103,6 @@ func (dh *DatabaseHandler) AddNewMember(members ...models.Member) error { member.Email = encEmail member.FirstVisit = encFirstVisit member.LastVisit = encLastVisit - member.Group = encGroup member.Comment = encComment err = dh.database.AddNewColum(&member) @@ -129,7 +122,7 @@ func (dh *DatabaseHandler) DeleteMember(ids ...uint) error { if len(ids) == 0 { return errors.New("no ids given to be deleted") } - return dh.database.DeleteById(&models.Member{}, ids...) + return dh.database.DeleteById(&models.Member{}, "", ids...) } // GetMember returns one member by given id @@ -138,7 +131,7 @@ 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) if err != nil { return } @@ -214,13 +207,6 @@ func (dh *DatabaseHandler) GetMember(id uint) (members []models.Member, err erro } } - if members[i].Group != "" { - members[i].Group, err = crypto.Decrypt(members[i].Group, dh.token) - if err != nil { - return - } - } - if members[i].Comment != "" { members[i].Comment, err = crypto.Decrypt(members[i].Comment, dh.token) if err != nil { @@ -316,20 +302,13 @@ func (dh *DatabaseHandler) UpdateMember(id int, member models.Member) (err error } } - if member.Group != "" { - member.Group, err = crypto.Encrypt(member.Group, dh.token) - if err != nil { - return err - } - } - 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)) + return dh.database.UpdateValuesById(&member, "", uint(member.Id)) } // memberExists helper to check wheter member already exists @@ -339,7 +318,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 } diff --git a/handlers/responsible.go b/handlers/responsible.go index ca2e364..313fdbf 100644 --- a/handlers/responsible.go +++ b/handlers/responsible.go @@ -6,35 +6,31 @@ import ( "gitea.tecamino.com/paadi/memberDB/models" ) -func (dh *DatabaseHandler) AddNewResponsible(responsibles ...models.Person) error { +func (dh *DatabaseHandler) AddNewResponsible(responsibles ...models.Responsible) error { if !dh.DatabaseOpened() { return errors.New("database not opened") } - 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 - } else if exists { + for i := range responsibles { + if !dh.database.Exists(&models.Member{}, "", "id", 25, false) { continue } - err = dh.database.AddNewColum(&responsible) + err := dh.database.AddNewColum(&responsibles[i]) if err != nil { return err } } + return nil } -func (dh *DatabaseHandler) GetResponsible(id uint) (persons []models.Person, err error) { +func (dh *DatabaseHandler) GetResponsible(id uint) (responsibles models.Responsibles, err error) { if !dh.DatabaseOpened() { - return persons, errors.New("database not opened") + return responsibles, errors.New("database not opened") } - err = dh.database.GetById(&persons, id) + err = dh.database.GetById(&responsibles, "Member", id) return } @@ -46,23 +42,5 @@ func (dh *DatabaseHandler) DeleteResponsible(ids ...uint) error { if len(ids) == 0 { return errors.New("no ids given to be deleted") } - return dh.database.DeleteById(&models.Person{}, ids...) -} - -func (dh *DatabaseHandler) responsibleExists(CheckResponsible models.Person) (bool, error) { - if !dh.DatabaseOpened() { - return false, errors.New("database not opened") - } - - var persons []models.Person - if !dh.database.Exists(&persons, "lastName", CheckResponsible.LastName, false) { - return false, nil - } - - for _, person := range persons { - if person.FirstName == CheckResponsible.FirstName && person.LastName == CheckResponsible.LastName { - return true, nil - } - } - return false, nil + return dh.database.DeleteById(&models.Responsible{}, "", ids...) } diff --git a/member_test.go b/member_test.go index eb1ff92..971a51f 100644 --- a/member_test.go +++ b/member_test.go @@ -175,22 +175,23 @@ func TestMemberDB(t *testing.T) { request{Log: "add existing member", Name: "add existing member", Method: "POST", Path: "/v1/members/add", Payload: payload{FirstName: "Adrian", LastName: "Zürcher", Birthday: "23.06.1987"}, ignoreError: true}, request{Log: "add new member", Name: "add new member", Method: "POST", Path: "/v1/members/add", Payload: payload{FirstName: "Paulina", LastName: "Zürcher", Birthday: "15.01.1991"}}, request{Log: "get members", Name: "get members", Method: "GET", Path: "/v1/members"}, - request{Log: "update members", Name: "update members", Method: "POST", Path: "/v1/members/edit?id=1", Payload: payload{Group: "testGroup"}}, + request{Log: "update members", Name: "update members", Method: "POST", Path: "/v1/members/edit?id=1", Payload: []models.Member{{Group: &models.Group{Name: "testGroup"}}}}, request{Log: "get again members", Name: "get again members", Method: "GET", Path: "/v1/members"}, - request{Log: "delete members", Name: "delete members", Method: "POST", Path: "/v1/members/delete", Payload: payload{Ids: []uint{2, 1}}}, + //request{Log: "delete members", Name: "delete members", Method: "POST", Path: "/v1/members/delete", Payload: payload{Ids: []uint{2, 1}}}, request{Log: "get again members", Name: "get again members", Method: "GET", Path: "/v1/members"}, - request{Log: "new event", Name: "new event", Method: "GET", Path: "/v1/events/new?name=testEvent"}, - request{Log: "add new attendee", Name: "add new attendee", Method: "POST", Path: "/v1/events/attendees/add", Payload: models.Event{Attendees: models.Persons{{FirstName: "Adi", LastName: "Züri"}}}}, - request{Log: "add another attendee", Name: "add another attendee", Method: "POST", Path: "/v1/events/attendees/add", Payload: models.Event{Attendees: models.Persons{{FirstName: "Pau", LastName: "Züri"}}}}, + request{Log: "new event", Name: "new event", Method: "POST", Path: "/v1/events/new", Payload: models.Event{Name: "testEvent"}}, + request{Log: "add new attendee", Name: "add new attendee", Method: "POST", Path: "/v1/events/attendees/add", Payload: models.Event{Attendees: []*models.Member{{Id: 26}}}}, + request{Log: "add another attendee", Name: "add another attendee", Method: "POST", Path: "/v1/events/attendees/add", Payload: models.Event{Attendees: []*models.Member{{Id: 2}}}}, request{Log: "get events", Name: "get events", Method: "GET", Path: "/v1/events"}, - request{Log: "add delete attendee", Name: "add delete attendee", Method: "POST", Path: "/v1/events/attendees/delete", Payload: models.Event{Attendees: models.Persons{{FirstName: "Adi", LastName: "Züri"}}}}, + //request{Log: "delete attendee", Name: "add delete attendee", Method: "POST", Path: "/v1/events/attendees/delete", Payload: models.Event{Attendees: []*models.Member{{FirstName: "Adi", LastName: "Züri"}}}}, request{Log: "get events", Name: "get events", Method: "GET", Path: "/v1/events"}, - request{Log: "add responsible", Name: "add responsible", Method: "POST", Path: "/v1/responsible/add", Payload: models.Person{FirstName: "Max", LastName: "Muster"}}, - request{Log: "add another responsible", Name: "add another responsible", Method: "POST", Path: "/v1/responsible/add", Payload: models.Person{FirstName: "Hausi", LastName: "Muster"}}, + //request{Log: "add responsible", Name: "add responsible", Method: "POST", Path: "/v1/responsible/add", Payload: models.Responsibles{models.Responsible{Member: &models.Member{FirstName: "Adi", LastName: "Züri"}}}}, + request{Log: "add another responsible", Name: "add another responsible", Method: "POST", Path: "/v1/responsible/add", Payload: models.Responsibles{models.Responsible{MemberId: 1}}}, + request{Log: "add another responsible", Name: "add another responsible", Method: "POST", Path: "/v1/responsible/add", Payload: models.Responsibles{models.Responsible{MemberId: 25}}}, request{Log: "get responsible", Name: "get responsible", Method: "GET", Path: "/v1/responsible"}, - request{Log: "delete responsible id 1", Name: "delete responsible id 1", Method: "POST", Path: "/v1/responsible/delete", Payload: payload{Ids: []uint{1}}}, + //request{Log: "delete responsible id 1", Name: "delete responsible id 1", Method: "POST", Path: "/v1/responsible/delete", Payload: payload{Ids: []uint{1}}}, request{Log: "get responsible", Name: "get responsible", Method: "GET", Path: "/v1/responsible"}, ) diff --git a/models/event.go b/models/event.go index 96ea941..b88d168 100644 --- a/models/event.go +++ b/models/event.go @@ -1,9 +1,9 @@ package models type Event struct { - Id int `gorm:"primaryKey" json:"id"` - Name string `gorm:"column:name" json:"name"` - Date string `gorm:"column:date" json:"date"` - Attendees Persons `gorm:"type:json" json:"attendees"` - Count int `gorm:"column:count" json:"count"` + Id int `gorm:"primaryKey" json:"id"` + 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;"` } diff --git a/models/member.go b/models/member.go index 7268e90..35c82eb 100644 --- a/models/member.go +++ b/models/member.go @@ -1,21 +1,24 @@ package models type Member struct { - Id int `gorm:"primaryKey" json:"id"` - FirstName string `gorm:"column:firstName" json:"firstName,omitempty"` - FirstNameHash string `gorm:"column:firstNameHash" json:"-"` - LastName string `gorm:"column:lastName" json:"lastName,omitempty"` - LastNameHash string `gorm:"column:lastNameHash" json:"-"` - Birthday string `gorm:"column:birthday" json:"birthday,omitempty"` - BirthdayHash string `gorm:"column:birthdayHash" json:"-"` - Address string `gorm:"column:address" json:"address,omitempty"` - Zip string `gorm:"column:zip" json:"zip,omitempty"` - Town string `gorm:"column:town" json:"town,omitempty"` - Phone string `gorm:"column:phone" json:"phone,omitempty"` - Email string `gorm:"column:email" json:"email,omitempty"` - 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 Person `gorm:"type:json" json:"responsiblePerson"` - Comment string `gorm:"column:comment" json:"comment"` + Id int `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"` + LastNameHash string `gorm:"column:lastNameHash" json:"-"` + Birthday string `gorm:"column:birthday" json:"birthday,omitempty"` + BirthdayHash string `gorm:"column:birthdayHash" json:"-"` + Address string `gorm:"column:address" json:"address,omitempty"` + Zip string `gorm:"column:zip" json:"zip,omitempty"` + Town string `gorm:"column:town" json:"town,omitempty"` + Phone string `gorm:"column:phone" json:"phone,omitempty"` + 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"` + Comment string `gorm:"column:comment" json:"comment,omitempty"` + Events []*Event `gorm:"many2many:member_events;" ` } diff --git a/models/person.go b/models/person.go deleted file mode 100644 index d389f19..0000000 --- a/models/person.go +++ /dev/null @@ -1,43 +0,0 @@ -package models - -import ( - "database/sql/driver" - "encoding/json" - "fmt" -) - -type Persons []Person - -// --- Implement driver.Valuer (for saving to DB) -func (r Persons) Value() (driver.Value, error) { - return json.Marshal(r) -} - -// --- Implement sql.Scanner (for reading from DB) -func (r *Persons) Scan(value any) error { - bytes, ok := value.([]byte) - if !ok { - return fmt.Errorf("failed to unmarshal Settings: %v", value) - } - 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) -} diff --git a/utils/utils.go b/utils/utils.go index 4622b40..ce9ac65 100644 --- a/utils/utils.go +++ b/utils/utils.go @@ -1,6 +1,7 @@ package utils import ( + "fmt" "net/mail" "time" ) @@ -25,3 +26,11 @@ func IsValidBirthday(birthday string) bool { } return false } + +func GetCurrentTime(loc *time.Location) string { + return time.Now().In(loc).Format("2006-01-02 15:04:05") +} + +func GetCurrentDay(loc *time.Location) string { + return fmt.Sprint(time.Now().In(loc).Weekday()) +}