GetUser() works

server/api/models/channel.go

@@ -0,0 +1,80 @@
+package models
+
+import (
+	"database/sql"
+	"github.com/blockloop/scan"
+	"time"
+)
+
+type Channel struct {
+	ChannelID         int64
+	OwnerUserID       int64
+	Name              string
+	SubscribeKey      string
+	SendKey           string
+	TimestampCreated  time.Time
+	TimestampLastRead *time.Time
+	TimestampLastSent *time.Time
+	MessagesSent      int
+}
+
+func (c Channel) JSON() ChannelJSON {
+	return ChannelJSON{
+		ChannelID:         c.ChannelID,
+		OwnerUserID:       c.OwnerUserID,
+		Name:              c.Name,
+		SubscribeKey:      c.SubscribeKey,
+		SendKey:           c.SendKey,
+		TimestampCreated:  c.TimestampCreated.Format(time.RFC3339Nano),
+		TimestampLastRead: timeOptFmt(c.TimestampLastRead, time.RFC3339Nano),
+		TimestampLastSent: timeOptFmt(c.TimestampLastSent, time.RFC3339Nano),
+		MessagesSent:      c.MessagesSent,
+	}
+}
+
+type ChannelJSON struct {
+	ChannelID         int64   `json:"channel_id"`
+	OwnerUserID       int64   `json:"owner_user_id"`
+	Name              string  `json:"name"`
+	SubscribeKey      string  `json:"subscribe_key"`
+	SendKey           string  `json:"send_key"`
+	TimestampCreated  string  `json:"timestamp_created"`
+	TimestampLastRead *string `json:"timestamp_last_read"`
+	TimestampLastSent *string `json:"timestamp_last_sent"`
+	MessagesSent      int     `json:"messages_sent"`
+}
+
+type ChannelDB struct {
+	ChannelID         int64  `db:"channel_id"`
+	OwnerUserID       int64  `db:"owner_user_id"`
+	Name              string `db:"name"`
+	SubscribeKey      string `db:"subscribe_key"`
+	SendKey           string `db:"send_key"`
+	TimestampCreated  int64  `db:"timestamp_created"`
+	TimestampLastRead *int64 `db:"timestamp_last_read"`
+	TimestampLastSent *int64 `db:"timestamp_last_sent"`
+	MessagesSent      int    `db:"messages_sent"`
+}
+
+func (c ChannelDB) Model() Channel {
+	return Channel{
+		ChannelID:         c.ChannelID,
+		OwnerUserID:       c.OwnerUserID,
+		Name:              c.Name,
+		SubscribeKey:      c.SubscribeKey,
+		SendKey:           c.SendKey,
+		TimestampCreated:  time.UnixMilli(c.TimestampCreated),
+		TimestampLastRead: timeOptFromMilli(c.TimestampLastRead),
+		TimestampLastSent: timeOptFromMilli(c.TimestampLastSent),
+		MessagesSent:      c.MessagesSent,
+	}
+}
+
+func DecodeChannel(r *sql.Rows) (Channel, error) {
+	var udb ChannelDB
+	err := scan.RowStrict(&udb, r)
+	if err != nil {
+		return Channel{}, err
+	}
+	return udb.Model(), nil
+}

server/api/models/user.go

@@ -1,12 +1,16 @@
 package models
 
-import "time"
+import (
+	"database/sql"
+	"github.com/blockloop/scan"
+	"time"
+)
 
 type User struct {
 	UserID            int64
 	Username          *string
-	ReadKey           string
 	SendKey           string
+	ReadKey           string
 	AdminKey          string
 	TimestampCreated  time.Time
 	TimestampLastRead *time.Time
@@ -49,3 +53,45 @@ type UserJSON struct {
 	QuotaDay          *string `json:"quota_day"`
 	IsPro             bool    `json:"is_pro"`
 }
+
+type UserDB struct {
+	UserID            int64   `db:"user_id"`
+	Username          *string `db:"username"`
+	SendKey           string  `db:"send_key"`
+	ReadKey           string  `db:"read_key"`
+	AdminKey          string  `db:"admin_key"`
+	TimestampCreated  int64   `db:"timestamp_created"`
+	TimestampLastRead *int64  `db:"timestamp_lastread"`
+	TimestampLastSent *int64  `db:"timestamp_lastsent"`
+	MessagesSent      int     `db:"messages_sent"`
+	QuotaToday        int     `db:"quota_today"`
+	QuotaDay          *string `db:"quota_day"`
+	IsPro             bool    `db:"is_pro"`
+	ProToken          *string `db:"pro_token"`
+}
+
+func (u UserDB) Model() User {
+	return User{
+		UserID:            u.UserID,
+		Username:          u.Username,
+		SendKey:           u.SendKey,
+		ReadKey:           u.ReadKey,
+		AdminKey:          u.AdminKey,
+		TimestampCreated:  time.UnixMilli(u.TimestampCreated),
+		TimestampLastRead: timeOptFromMilli(u.TimestampLastRead),
+		TimestampLastSent: timeOptFromMilli(u.TimestampLastSent),
+		MessagesSent:      u.MessagesSent,
+		QuotaToday:        u.QuotaToday,
+		QuotaDay:          u.QuotaDay,
+		IsPro:             u.IsPro,
+	}
+}
+
+func DecodeUser(r *sql.Rows) (User, error) {
+	var udb UserDB
+	err := scan.RowStrict(&udb, r)
+	if err != nil {
+		return User{}, err
+	}
+	return udb.Model(), nil
+}

server/api/models/utils.go

@@ -12,3 +12,10 @@ func timeOptFmt(t *time.Time, fmt string) *string {
 		return langext.Ptr(t.Format(fmt))
 	}
 }
+
+func timeOptFromMilli(millis *int64) *time.Time {
+	if millis == nil {
+		return nil
+	}
+	return langext.Ptr(time.UnixMilli(*millis))
+}