Add functionality to write and read metadata

Signed-off-by: William <[email protected]>

internal/models/types.go

@@ -0,0 +1,35 @@
+package models
+
+import (
+	"database/sql/driver"
+	"encoding/json"
+	"errors"
+)
+
+// JSONB Interface
+type JSONB map[string]interface{}
+
+// Value Marshal
+func (j JSONB) Value() (driver.Value, error) {
+	return json.Marshal(j)
+}
+
+// Scan Unmarshal
+func (j *JSONB) Scan(value interface{}) error {
+	source, ok := value.([]byte)
+	if !ok {
+		return errors.New("Type assertion .([]byte) failed.")
+	}
+
+	var i interface{}
+	err := json.Unmarshal(source, &i)
+	if err != nil {
+		return err
+	}
+
+	*j, ok = i.(map[string]interface{})
+	if !ok {
+		return errors.New("Type assertion .(map[string]interface{}) failed.")
+	}
+	return nil
+}

internal/models/user_model.go

@@ -14,6 +14,7 @@ type User struct {
 	TwoFactorMethod  string   `json:"twoFactorMethod"`
 	TOTPSecret       string   `json:"-"`
 	TOTPURL          string   `json:"-"`
+	Metadata         JSONB    `json:"metadata"`
 }
 type EnableTwoFactorRequest struct {
 	Type string `json:"type"`
@@ -39,4 +40,5 @@ type UserUpdateRequest struct {
 	LastName                     string `json:"lastName"`
 	CellNumber                   string `json:"cellNumber"`
 	AllowTwoFactorAuthentication bool   `json:"allowTwoFactorAuthentication"`
+	Metadata                     JSONB  `json:"metadata"`
 }

internal/services/user_service.go

@@ -76,7 +76,8 @@ func (usrSrv *UserService) Get(userId int) *models.User {
 			users.two_factor_enabled,
 			users.two_factor_method,
 			users.totp_secret ,
-			users.totp_url
+			users.totp_url,
+			users.meta_data
 		FROM 
 			users 
 		WHERE 
@@ -87,7 +88,7 @@ func (usrSrv *UserService) Get(userId int) *models.User {
 	// Inject the data into the struct
 	err := row.Scan(&userDetails.ID, &userDetails.UUID, &userDetails.Username, &userDetails.FirstName,
 		&userDetails.LastName, &userDetails.EmailAddress, &userDetails.CellNumber, &userDetails.Active, &userDetails.TwoFactorEnabled,
-		&userDetails.TwoFactorMethod, &userDetails.TOTPSecret, &userDetails.TOTPURL,
+		&userDetails.TwoFactorMethod, &userDetails.TOTPSecret, &userDetails.TOTPURL, &userDetails.Metadata,
 	)
 	roles, _ := usrSrv.GetRoles(userDetails.ID)
 	userDetails.Roles = roles
@@ -203,10 +204,16 @@ func (usrSrv *UserService) Update(userId int, userUpdateRequest models.UserUpdat
 	}
 	// Update cell number
 	if strings.Trim(userUpdateRequest.CellNumber, "") != "" {
-		query += fmt.Sprintf("cell_number =$%d,", argCount)
+		query += fmt.Sprintf("cell_number =$%d, ", argCount)
 		args = append(args, userUpdateRequest.CellNumber)
 		argCount++
 	}
+
+	if userUpdateRequest.Metadata != nil {
+		query += fmt.Sprintf("meta_data = $%d, ", argCount)
+		args = append(args, userUpdateRequest.Metadata)
+		argCount++
+	}
 	// Remove the trailing comma and space
 	query = query[:len(query)-2]
 	query += fmt.Sprintf(" WHERE id = $%d", argCount)