remove required birthday

api/membersHandler.go

@@ -37,9 +37,7 @@ func (a *APIHandler) AddNewMember(c *gin.Context) {
 	if member.LastName == "" {
 		text += "lastName "
 	}
-	if member.Birthday == "" {
-		text += "birthday "
-	}
+
 	if text != "" {
 		a.logger.Error("AddNewMember", text+"can not be empty")
 		c.JSON(http.StatusBadRequest, gin.H{

handlers/members.go

@@ -91,6 +91,11 @@ func (dh *DatabaseHandler) AddNewMember(members ...models.Member) error {
 			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)
@@ -105,6 +110,7 @@ func (dh *DatabaseHandler) AddNewMember(members ...models.Member) error {
 		member.FirstVisit = encFirstVisit
 		member.LastVisit = encLastVisit
 		member.Group = encGroup
+		member.Comment = encComment
 
 		err = dh.database.AddNewColum(&member)
 		if err != nil {
@@ -138,61 +144,90 @@ func (dh *DatabaseHandler) GetMember(id uint) (members []models.Member, err erro
 	}
 
 	for i := range members {
+		if members[i].FirstName != "" {
 			members[i].FirstName, err = crypto.Decrypt(members[i].FirstName, dh.token)
 			if err != nil {
 				return
 			}
+		}
 
+		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].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 {
+				return
+			}
+		}
+	}
 	return
 }
 
@@ -287,6 +322,13 @@ func (dh *DatabaseHandler) UpdateMember(id int, member models.Member) (err error
 			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))
 }
 
@@ -296,9 +338,16 @@ func (dh *DatabaseHandler) memberExists(checkMember models.Member) (bool, error)
 		return false, errors.New("database not opened")
 	}
 
-	var member models.Member
-	if !dh.database.Exists(&member, "birthdayHash", dh.hashField(checkMember.Birthday), false) {
+	var members []models.Member
+	if !dh.database.Exists(&members, "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
+
+	for _, member := range members {
+		if dh.hashField(checkMember.FirstName) == member.FirstNameHash && dh.hashField(checkMember.LastName) == member.LastNameHash && dh.hashField(checkMember.Birthday) == member.BirthdayHash {
+			return true, nil
+		}
+	}
+
+	return false, nil
 }

handlers/responsible.go

@@ -54,9 +54,15 @@ func (dh *DatabaseHandler) responsibleExists(CheckResponsible models.Person) (bo
 		return false, errors.New("database not opened")
 	}
 
-	var person models.Person
-	if !dh.database.Exists(&person, "lastName", CheckResponsible.LastName, false) {
+	var persons []models.Person
+	if !dh.database.Exists(&persons, "lastName", CheckResponsible.LastName, false) {
 		return false, nil
 	}
-	return person.FirstName == CheckResponsible.FirstName && person.LastName == CheckResponsible.LastName, nil
+
+	for _, person := range persons {
+		if person.FirstName == CheckResponsible.FirstName && person.LastName == CheckResponsible.LastName {
+			return true, nil
+		}
+	}
+	return false, nil
 }

models/member.go

@@ -17,4 +17,5 @@ type Member struct {
 	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"`
 }