Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
21388b63fb | ||
|
|
86a4ef798a |
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.0.4
|
||||
gitea.tecamino.com/paadi/dbHandler v1.0.7
|
||||
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.0.4 h1:ctnaec0GDdtw3gRQdUISVDYLJ9x+vt50VW41OemfhD4=
|
||||
gitea.tecamino.com/paadi/dbHandler v1.0.4/go.mod h1:y/xn/POJg1DO++67uKvnO23lJQgh+XFQq7HZCS9Getw=
|
||||
gitea.tecamino.com/paadi/dbHandler v1.0.7 h1:777QiVuv6CNsRT/dVtiiQd3NIOQcw7PoYo3Anz4ll+M=
|
||||
gitea.tecamino.com/paadi/dbHandler v1.0.7/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=
|
||||
|
||||
@@ -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")
|
||||
}
|
||||
|
||||
|
||||
@@ -297,8 +297,7 @@ func (dh *DatabaseHandler) memberExists(checkMember models.Member) (bool, error)
|
||||
}
|
||||
|
||||
var member models.Member
|
||||
err := dh.database.Exists(&member, "birthdayHash", dh.hashField(checkMember.Birthday), false)
|
||||
if err != nil {
|
||||
if !dh.database.Exists(&member, "birthdayHash", dh.hashField(checkMember.Birthday), false) {
|
||||
return false, nil
|
||||
}
|
||||
return dh.hashField(checkMember.FirstName) == member.FirstNameHash && dh.hashField(checkMember.LastName) == member.LastNameHash && dh.hashField(checkMember.Birthday) == member.BirthdayHash, nil
|
||||
|
||||
@@ -55,8 +55,7 @@ func (dh *DatabaseHandler) responsibleExists(CheckResponsible models.Person) (bo
|
||||
}
|
||||
|
||||
var person models.Person
|
||||
err := dh.database.Exists(&person, "lastName", CheckResponsible.LastName, false)
|
||||
if err != nil {
|
||||
if !dh.database.Exists(&person, "lastName", CheckResponsible.LastName, false) {
|
||||
return false, nil
|
||||
}
|
||||
return person.FirstName == CheckResponsible.FirstName && person.LastName == CheckResponsible.LastName, nil
|
||||
|
||||
@@ -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)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user