ListClients()

server/api/models/channel.go

@@ -3,6 +3,7 @@ package models
 import (
 	"database/sql"
 	"github.com/blockloop/scan"
+	"gogs.mikescher.com/BlackForestBytes/goext/langext"
 	"time"
 )
 
@@ -71,10 +72,19 @@ func (c ChannelDB) Model() Channel {
 }
 
 func DecodeChannel(r *sql.Rows) (Channel, error) {
-	var udb ChannelDB
-	err := scan.RowStrict(&udb, r)
+	var data ChannelDB
+	err := scan.RowStrict(&data, r)
 	if err != nil {
 		return Channel{}, err
 	}
-	return udb.Model(), nil
+	return data.Model(), nil
+}
+
+func DecodeChannels(r *sql.Rows) ([]Channel, error) {
+	var data []ChannelDB
+	err := scan.RowsStrict(&data, r)
+	if err != nil {
+		return nil, err
+	}
+	return langext.ArrMap(data, func(v ChannelDB) Channel { return v.Model() }), nil
 }

server/api/models/client.go

@@ -1,6 +1,11 @@
 package models
 
-import "time"
+import (
+	"database/sql"
+	"github.com/blockloop/scan"
+	"gogs.mikescher.com/BlackForestBytes/goext/langext"
+	"time"
+)
 
 type ClientType string
 
@@ -19,5 +24,64 @@ type Client struct {
 	AgentVersion     string
 }
 
-type ClientJSON struct {
+func (c Client) JSON() ClientJSON {
+	return ClientJSON{
+		ClientID:         c.ClientID,
+		UserID:           c.UserID,
+		Type:             c.Type,
+		FCMToken:         c.FCMToken,
+		TimestampCreated: c.TimestampCreated.Format(time.RFC3339Nano),
+		AgentModel:       c.AgentModel,
+		AgentVersion:     c.AgentVersion,
+	}
+}
+
+type ClientJSON struct {
+	ClientID         int64      `json:"client_id"`
+	UserID           int64      `json:"user_id"`
+	Type             ClientType `json:"type"`
+	FCMToken         *string    `json:"fcm_token"`
+	TimestampCreated string     `json:"timestamp_created"`
+	AgentModel       string     `json:"agent_model"`
+	AgentVersion     string     `json:"agent_version"`
+}
+
+type ClientDB struct {
+	ClientID         int64      `db:"client_id"`
+	UserID           int64      `db:"user_id"`
+	Type             ClientType `db:"type"`
+	FCMToken         *string    `db:"fcm_token"`
+	TimestampCreated int64      `db:"timestamp_created"`
+	AgentModel       string     `db:"agent_model"`
+	AgentVersion     string     `db:"agent_version"`
+}
+
+func (c ClientDB) Model() Client {
+	return Client{
+		ClientID:         c.ClientID,
+		UserID:           c.UserID,
+		Type:             c.Type,
+		FCMToken:         c.FCMToken,
+		TimestampCreated: time.UnixMilli(c.TimestampCreated),
+		AgentModel:       c.AgentModel,
+		AgentVersion:     c.AgentVersion,
+	}
+}
+
+func DecodeClient(r *sql.Rows) (Client, error) {
+	var data ClientDB
+	err := scan.RowStrict(&data, r)
+	if err != nil {
+		return Client{}, err
+	}
+	return data.Model(), nil
+}
+
+func DecodeClients(r *sql.Rows) ([]Client, error) {
+	var data []ClientDB
+	err := scan.RowsStrict(&data, r)
+	if err != nil {
+		return nil, err
+	}
+	return langext.ArrMap(data, func(v ClientDB) Client { return v.Model() }), nil
 }

server/api/models/user.go

@@ -3,6 +3,7 @@ package models
 import (
 	"database/sql"
 	"github.com/blockloop/scan"
+	"gogs.mikescher.com/BlackForestBytes/goext/langext"
 	"time"
 )
 
@@ -88,10 +89,19 @@ func (u UserDB) Model() User {
 }
 
 func DecodeUser(r *sql.Rows) (User, error) {
-	var udb UserDB
-	err := scan.RowStrict(&udb, r)
+	var data UserDB
+	err := scan.RowStrict(&data, r)
 	if err != nil {
 		return User{}, err
 	}
-	return udb.Model(), nil
+	return data.Model(), nil
+}
+
+func DecodeUsers(r *sql.Rows) ([]User, error) {
+	var data []UserDB
+	err := scan.RowsStrict(&data, r)
+	if err != nil {
+		return nil, err
+	}
+	return langext.ArrMap(data, func(v UserDB) User { return v.Model() }), nil
 }