Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
86a4ef798a | ||
|
|
442afcb44c | ||
|
|
8b8d99e162 |
@@ -24,14 +24,13 @@ func (a *APIHandler) AddNewResponsible(c *gin.Context) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, responsible := range responsibles {
|
err = a.DbHandler.AddNewResponsible(responsibles...)
|
||||||
err = a.DbHandler.AddNewResponsible(responsible)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
c.JSON(http.StatusBadRequest, gin.H{
|
c.JSON(http.StatusBadRequest, gin.H{
|
||||||
"message": err.Error(),
|
"message": err.Error(),
|
||||||
})
|
})
|
||||||
return
|
return
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
c.JSON(http.StatusOK, gin.H{
|
c.JSON(http.StatusOK, gin.H{
|
||||||
|
|||||||
@@ -91,11 +91,6 @@ func (dh *DatabaseHandler) AddNewMember(members ...models.Member) error {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
encResponsiblePerson, err := crypto.Encrypt(member.ResponsiblePerson, dh.token)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
member.FirstNameHash = dh.hashField(member.FirstName)
|
member.FirstNameHash = dh.hashField(member.FirstName)
|
||||||
member.FirstName = encFirstName
|
member.FirstName = encFirstName
|
||||||
member.LastNameHash = dh.hashField(member.LastName)
|
member.LastNameHash = dh.hashField(member.LastName)
|
||||||
@@ -110,7 +105,6 @@ func (dh *DatabaseHandler) AddNewMember(members ...models.Member) error {
|
|||||||
member.FirstVisit = encFirstVisit
|
member.FirstVisit = encFirstVisit
|
||||||
member.LastVisit = encLastVisit
|
member.LastVisit = encLastVisit
|
||||||
member.Group = encGroup
|
member.Group = encGroup
|
||||||
member.ResponsiblePerson = encResponsiblePerson
|
|
||||||
|
|
||||||
err = dh.database.AddNewColum(&member)
|
err = dh.database.AddNewColum(&member)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -198,11 +192,6 @@ func (dh *DatabaseHandler) GetMember(id uint) (members []models.Member, err erro
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
members[i].ResponsiblePerson, err = crypto.Decrypt(members[i].ResponsiblePerson, dh.token)
|
|
||||||
if err != nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -298,13 +287,6 @@ func (dh *DatabaseHandler) UpdateMember(id int, member models.Member) (err error
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if member.ResponsiblePerson != "" {
|
|
||||||
member.ResponsiblePerson, err = crypto.Encrypt(member.ResponsiblePerson, dh.token)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return dh.database.UpdateValuesById(&member, uint(member.Id))
|
return dh.database.UpdateValuesById(&member, uint(member.Id))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -10,11 +10,10 @@ func (dh *DatabaseHandler) AddNewResponsible(responsibles ...models.Person) erro
|
|||||||
if !dh.DatabaseOpened() {
|
if !dh.DatabaseOpened() {
|
||||||
return errors.New("database not opened")
|
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)
|
exists, err := dh.responsibleExists(responsible)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
|
|||||||
@@ -16,5 +16,5 @@ type Member struct {
|
|||||||
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"`
|
||||||
Group string `gorm:"column:group" json:"group,omitempty"`
|
Group string `gorm:"column:group" json:"group,omitempty"`
|
||||||
ResponsiblePerson string `gorm:"column:responsiblePerson" json:"responsiblePerson,omitempty"`
|
ResponsiblePerson Person `gorm:"type:json" json:"responsiblePerson"`
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,12 +8,6 @@ import (
|
|||||||
|
|
||||||
type Persons []Person
|
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)
|
// --- Implement driver.Valuer (for saving to DB)
|
||||||
func (r Persons) Value() (driver.Value, error) {
|
func (r Persons) Value() (driver.Value, error) {
|
||||||
return json.Marshal(r)
|
return json.Marshal(r)
|
||||||
@@ -27,3 +21,23 @@ func (r *Persons) Scan(value any) error {
|
|||||||
}
|
}
|
||||||
return json.Unmarshal(bytes, r)
|
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