Upstream sync

data/datamysql/user.go

@@ -22,6 +22,32 @@ func newUserRepo(conn executor) *userRepo {
 	}
 }
 
+func (c *userRepo) GetByMemberID(memberID string) (entity.User, error) {
+	finalQuery := c.getQuery() + " AND a.member = ? AND e.key = 'US'"
+
+	user, err := c.parseSet(c.conn.Query(finalQuery, memberID))
+	if err != nil {
+		return entity.User{}, err
+	}
+
+	if len(user) > 0 {
+		retVal := user[0]
+		retVal.Contacts, err = c.GetContacts(retVal.ID)
+		if err != nil {
+			return entity.User{}, err
+		}
+
+		retVal.Addresses = nil
+		retVal.Addresses, err = c.getAddressByUserID(retVal.ID)
+		if err != nil {
+			return entity.User{}, err
+		}
+		return retVal, nil
+	} else {
+		return entity.User{}, nil
+	}
+}
+
 func (c *userRepo) GetByUUID(uuid string, profile string) (entity.User, error) {
 	params := make([]interface{}, 0)
 	params = append(params, uuid)
@@ -390,6 +416,24 @@ func (c *userRepo) SaveContact(contact entity.ContactInfo) (entity.ContactInfo,
 	return c.addContactInfo(contact)
 }
 
+func (c *userRepo) UpdateLogin(user entity.User) error {
+	const (
+		query = `UPDATE      tab_login   a
+							INNER JOIN tab_user    b
+									ON      a.user_id       =   b.user_id
+								SET      a.email         =   ?,
+													a.phone_number  =   ?
+							WHERE  
+													b.user_uuid     = ?`
+	)
+
+	if _, err := c.conn.Exec(query, user.Email, user.PhoneNumber, user.UUID); err != nil {
+		return err
+	}
+
+	return nil
+}
+
 func (c *userRepo) RemoveContact(contact entity.ContactInfo) (entity.ContactInfo, error) {
 	const (
 		query = `DELETE FROM tab_contact WHERE contact_uuid = ?;`
@@ -561,7 +605,7 @@ func (c *userRepo) createUser(user entity.User) (int64, string, error) {
 
 func (c *userRepo) RemoveAddress(addressUUID string) error {
 	const (
-		query = "UPDATE tab_address SET active = 0 WHERE address_uuid = ?"
+		query = "DELETE FROM tab_address WHERE address_uuid = ?;"
 	)
 
 	_, err := c.conn.Exec(query, addressUUID)