feat: migrations
This commit is contained in:
@ -1,17 +1,23 @@
|
||||
package client
|
||||
|
||||
import (
|
||||
"embed"
|
||||
"io/fs"
|
||||
"net/http"
|
||||
|
||||
"github.com/spotdemo4/trevstack/server/internal/interceptors"
|
||||
)
|
||||
|
||||
var embedfs *http.FileSystem
|
||||
|
||||
func NewClientHandler(key string) http.Handler {
|
||||
if embedfs != nil {
|
||||
return interceptors.WithAuthRedirect(http.FileServer(*embedfs), key)
|
||||
func NewClientHandler(key string, clientFS *embed.FS) http.Handler {
|
||||
if clientFS == nil {
|
||||
return http.NotFoundHandler()
|
||||
}
|
||||
|
||||
return http.NotFoundHandler()
|
||||
client, err := fs.Sub(clientFS, "client")
|
||||
if err != nil {
|
||||
return http.NotFoundHandler()
|
||||
}
|
||||
|
||||
fs := http.FS(client)
|
||||
return interceptors.WithAuthRedirect(http.FileServer(fs), key)
|
||||
}
|
||||
|
@ -1,24 +0,0 @@
|
||||
//go:build !dev
|
||||
|
||||
package client
|
||||
|
||||
import (
|
||||
"embed"
|
||||
"io/fs"
|
||||
"log"
|
||||
"net/http"
|
||||
)
|
||||
|
||||
//go:embed all:client
|
||||
var eclient embed.FS
|
||||
|
||||
func init() {
|
||||
log.Println("Initializing client for production")
|
||||
client, err := fs.Sub(eclient, "client")
|
||||
if err != nil {
|
||||
log.Fatalf("failed to get client: %v", err)
|
||||
}
|
||||
|
||||
fs := http.FS(client)
|
||||
embedfs = &fs
|
||||
}
|
@ -9,7 +9,6 @@ import (
|
||||
|
||||
"connectrpc.com/connect"
|
||||
"github.com/aarondl/opt/omit"
|
||||
"github.com/aarondl/opt/omitnull"
|
||||
"github.com/spotdemo4/trevstack/server/internal/interceptors"
|
||||
"github.com/spotdemo4/trevstack/server/internal/models"
|
||||
itemv1 "github.com/spotdemo4/trevstack/server/internal/services/item/v1"
|
||||
@ -26,9 +25,9 @@ func itemToConnect(item *models.Item) *itemv1.Item {
|
||||
return &itemv1.Item{
|
||||
Id: &item.ID,
|
||||
Name: item.Name,
|
||||
Description: item.Description.GetOrZero(),
|
||||
Price: item.Price.GetOrZero(),
|
||||
Quantity: int32(item.Quantity.GetOrZero()),
|
||||
Description: item.Description,
|
||||
Price: item.Price,
|
||||
Quantity: int32(item.Quantity),
|
||||
Added: timestamp,
|
||||
}
|
||||
}
|
||||
@ -133,9 +132,9 @@ func (h *Handler) CreateItem(ctx context.Context, req *connect.Request[itemv1.Cr
|
||||
|
||||
item, err := models.Items.Insert(&models.ItemSetter{
|
||||
Name: omit.From(req.Msg.Item.Name),
|
||||
Description: omitnull.From(req.Msg.Item.Description),
|
||||
Price: omitnull.From(req.Msg.Item.Price),
|
||||
Quantity: omitnull.From(int64(req.Msg.Item.Quantity)),
|
||||
Description: omit.From(req.Msg.Item.Description),
|
||||
Price: omit.From(req.Msg.Item.Price),
|
||||
Quantity: omit.From(int64(req.Msg.Item.Quantity)),
|
||||
Added: omit.From(time.Now()),
|
||||
UserID: omit.From(userid),
|
||||
}).One(ctx, h.db)
|
||||
@ -165,9 +164,9 @@ func (h *Handler) UpdateItem(ctx context.Context, req *connect.Request[itemv1.Up
|
||||
// Set col
|
||||
models.ItemSetter{
|
||||
Name: omit.From(req.Msg.Item.Name),
|
||||
Description: omitnull.From(req.Msg.Item.Description),
|
||||
Price: omitnull.From(req.Msg.Item.Price),
|
||||
Quantity: omitnull.From(int64(req.Msg.Item.Quantity)),
|
||||
Description: omit.From(req.Msg.Item.Description),
|
||||
Price: omit.From(req.Msg.Item.Price),
|
||||
Quantity: omit.From(int64(req.Msg.Item.Quantity)),
|
||||
}.UpdateMod(),
|
||||
|
||||
// Where
|
||||
|
Reference in New Issue
Block a user