refactor: move backend files to backend/ directory
Reorganize project structure: - backend/cmd/openteam/ — entry point - backend/internal/ — core packages - backend/middleware/ — HTTP middleware - backend/router/ — route setup - backend/wire/ — dependency injection - backend/pkg/ — shared utilities - backend/go.mod, go.sum — Go module files Updated Makefile to work from backend/ directory. Removed old lowercase makefile.
This commit is contained in:
@@ -0,0 +1,68 @@
|
||||
package dao
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"opencatd-open/internal/store"
|
||||
|
||||
"gorm.io/gorm"
|
||||
)
|
||||
|
||||
type ApiKeyDAO struct {
|
||||
db *gorm.DB
|
||||
}
|
||||
|
||||
func NewApiKeyDAO(db *gorm.DB) *ApiKeyDAO {
|
||||
return &ApiKeyDAO{db: db}
|
||||
}
|
||||
|
||||
func (d *ApiKeyDAO) Create(apiKey *store.APIKey) error {
|
||||
if apiKey == nil {
|
||||
return errors.New("apiKey is nil")
|
||||
}
|
||||
return d.db.Create(apiKey).Error
|
||||
}
|
||||
|
||||
func (d *ApiKeyDAO) GetByID(id uint64) (*store.APIKey, error) {
|
||||
var apiKey store.APIKey
|
||||
err := d.db.First(&apiKey, id).Error
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return &apiKey, nil
|
||||
}
|
||||
|
||||
func (d *ApiKeyDAO) GetByHash(keyHash string) (*store.APIKey, error) {
|
||||
var apiKey store.APIKey
|
||||
err := d.db.Where("key_hash = ? AND status = ?", keyHash, store.KeyStatusActive).First(&apiKey).Error
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return &apiKey, nil
|
||||
}
|
||||
|
||||
func (d *ApiKeyDAO) ListByUserID(userID uint64, limit, offset int) ([]*store.APIKey, int64, error) {
|
||||
var apiKeys []*store.APIKey
|
||||
var total int64
|
||||
db := d.db.Where("user_id = ?", userID)
|
||||
db.Model(&store.APIKey{}).Count(&total)
|
||||
err := db.Limit(limit).Offset(offset).Order("created_at DESC").Find(&apiKeys).Error
|
||||
return apiKeys, total, err
|
||||
}
|
||||
|
||||
func (d *ApiKeyDAO) Update(apiKey *store.APIKey) error {
|
||||
if apiKey == nil {
|
||||
return errors.New("apiKey is nil")
|
||||
}
|
||||
return d.db.Save(apiKey).Error
|
||||
}
|
||||
|
||||
func (d *ApiKeyDAO) Delete(id uint64) error {
|
||||
return d.db.Delete(&store.APIKey{}, id).Error
|
||||
}
|
||||
|
||||
func (d *ApiKeyDAO) BatchDelete(ids []uint64) error {
|
||||
if len(ids) == 0 {
|
||||
return errors.New("ids is empty")
|
||||
}
|
||||
return d.db.Delete(&store.APIKey{}, ids).Error
|
||||
}
|
||||
@@ -0,0 +1,105 @@
|
||||
package dao
|
||||
|
||||
import (
|
||||
"opencatd-open/internal/store"
|
||||
|
||||
"gorm.io/gorm"
|
||||
)
|
||||
|
||||
type ChannelDAO struct {
|
||||
db *gorm.DB
|
||||
}
|
||||
|
||||
func NewChannelDAO(db *gorm.DB) *ChannelDAO {
|
||||
return &ChannelDAO{db: db}
|
||||
}
|
||||
|
||||
func (d *ChannelDAO) Create(channel *store.Channel) error {
|
||||
return d.db.Create(channel).Error
|
||||
}
|
||||
|
||||
func (d *ChannelDAO) GetByID(id uint64) (*store.Channel, error) {
|
||||
var channel store.Channel
|
||||
err := d.db.First(&channel, id).Error
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return &channel, nil
|
||||
}
|
||||
|
||||
func (d *ChannelDAO) GetByName(name string) (*store.Channel, error) {
|
||||
var channel store.Channel
|
||||
err := d.db.Where("name = ?", name).First(&channel).Error
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return &channel, nil
|
||||
}
|
||||
|
||||
func (d *ChannelDAO) List(limit, offset int) ([]*store.Channel, int64, error) {
|
||||
var channels []*store.Channel
|
||||
var total int64
|
||||
d.db.Model(&store.Channel{}).Count(&total)
|
||||
err := d.db.Limit(limit).Offset(offset).Order("priority DESC, weight DESC").Find(&channels).Error
|
||||
return channels, total, err
|
||||
}
|
||||
|
||||
func (d *ChannelDAO) ListEnabled() ([]*store.Channel, error) {
|
||||
var channels []*store.Channel
|
||||
err := d.db.Where("enabled = ?", true).Order("priority DESC, weight DESC").Find(&channels).Error
|
||||
return channels, err
|
||||
}
|
||||
|
||||
func (d *ChannelDAO) Update(channel *store.Channel) error {
|
||||
return d.db.Save(channel).Error
|
||||
}
|
||||
|
||||
func (d *ChannelDAO) Delete(id uint64) error {
|
||||
return d.db.Delete(&store.Channel{}, id).Error
|
||||
}
|
||||
|
||||
// BindModels binds models to a channel (replaces existing bindings)
|
||||
func (d *ChannelDAO) BindModels(channelID uint64, bindings []store.ChannelModelBinding) error {
|
||||
return d.db.Transaction(func(tx *gorm.DB) error {
|
||||
// Delete existing bindings
|
||||
if err := tx.Where("channel_id = ?", channelID).Delete(&store.ChannelModelBinding{}).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
// Create new bindings
|
||||
for i := range bindings {
|
||||
bindings[i].ChannelID = channelID
|
||||
}
|
||||
return tx.Create(&bindings).Error
|
||||
})
|
||||
}
|
||||
|
||||
// GetChannelModels returns all models bound to a channel
|
||||
func (d *ChannelDAO) GetChannelModels(channelID uint64) ([]store.ChannelModelBinding, error) {
|
||||
var bindings []store.ChannelModelBinding
|
||||
err := d.db.Where("channel_id = ?", channelID).Find(&bindings).Error
|
||||
return bindings, err
|
||||
}
|
||||
|
||||
// GetModelChannels returns all channels that support a given model (by model name)
|
||||
func (d *ChannelDAO) GetModelChannels(modelName string) ([]store.ChannelModelBinding, error) {
|
||||
var bindings []store.ChannelModelBinding
|
||||
err := d.db.
|
||||
Joins("JOIN channels ON channels.id = channel_model_bindings.channel_id").
|
||||
Joins("JOIN models ON models.id = channel_model_bindings.model_id").
|
||||
Where("models.name = ? AND channels.enabled = ?", modelName, true).
|
||||
Find(&bindings).Error
|
||||
return bindings, err
|
||||
}
|
||||
|
||||
// GetEnabledChannelsByModel returns enabled channels for a model, ordered by priority/weight
|
||||
func (d *ChannelDAO) GetEnabledChannelsByModel(modelName string) ([]*store.Channel, error) {
|
||||
var channels []*store.Channel
|
||||
err := d.db.
|
||||
Distinct("channels.*").
|
||||
Joins("JOIN channel_model_bindings ON channel_model_bindings.channel_id = channels.id").
|
||||
Joins("JOIN models ON models.id = channel_model_bindings.model_id").
|
||||
Where("models.name = ? AND channels.enabled = ?", modelName, true).
|
||||
Order("channels.priority DESC, channels.weight DESC").
|
||||
Find(&channels).Error
|
||||
return channels, err
|
||||
}
|
||||
@@ -0,0 +1,71 @@
|
||||
package dao
|
||||
|
||||
import (
|
||||
"opencatd-open/internal/store"
|
||||
|
||||
"gorm.io/gorm"
|
||||
)
|
||||
|
||||
type ModelDAO struct {
|
||||
db *gorm.DB
|
||||
}
|
||||
|
||||
func NewModelDAO(db *gorm.DB) *ModelDAO {
|
||||
return &ModelDAO{db: db}
|
||||
}
|
||||
|
||||
func (d *ModelDAO) Create(model *store.Model) error {
|
||||
return d.db.Create(model).Error
|
||||
}
|
||||
|
||||
func (d *ModelDAO) GetByID(id uint64) (*store.Model, error) {
|
||||
var model store.Model
|
||||
err := d.db.First(&model, id).Error
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return &model, nil
|
||||
}
|
||||
|
||||
func (d *ModelDAO) GetByName(name string) (*store.Model, error) {
|
||||
var model store.Model
|
||||
err := d.db.Where("name = ?", name).First(&model).Error
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return &model, nil
|
||||
}
|
||||
|
||||
func (d *ModelDAO) List(limit, offset int) ([]*store.Model, int64, error) {
|
||||
var models []*store.Model
|
||||
var total int64
|
||||
d.db.Model(&store.Model{}).Count(&total)
|
||||
err := d.db.Limit(limit).Offset(offset).Order("sort ASC, name ASC").Find(&models).Error
|
||||
return models, total, err
|
||||
}
|
||||
|
||||
func (d *ModelDAO) ListEnabled() ([]*store.Model, error) {
|
||||
var models []*store.Model
|
||||
err := d.db.Where("enabled = ?", true).Order("sort ASC, name ASC").Find(&models).Error
|
||||
return models, err
|
||||
}
|
||||
|
||||
func (d *ModelDAO) Update(model *store.Model) error {
|
||||
return d.db.Save(model).Error
|
||||
}
|
||||
|
||||
func (d *ModelDAO) Delete(id uint64) error {
|
||||
return d.db.Delete(&store.Model{}, id).Error
|
||||
}
|
||||
|
||||
// Upsert creates or updates a model by name
|
||||
func (d *ModelDAO) Upsert(model *store.Model) error {
|
||||
return d.db.Where("name = ?", model.Name).Assign(store.Model{
|
||||
DisplayName: model.DisplayName,
|
||||
InputPrice: model.InputPrice,
|
||||
OutputPrice: model.OutputPrice,
|
||||
CacheReadPrice: model.CacheReadPrice,
|
||||
Enabled: model.Enabled,
|
||||
Sort: model.Sort,
|
||||
}).FirstOrCreate(model).Error
|
||||
}
|
||||
@@ -0,0 +1,38 @@
|
||||
package dao
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"opencatd-open/internal/store"
|
||||
|
||||
"gorm.io/gorm"
|
||||
)
|
||||
|
||||
type TokenDAO struct {
|
||||
db *gorm.DB
|
||||
}
|
||||
|
||||
func NewTokenDAO(db *gorm.DB) *TokenDAO {
|
||||
return &TokenDAO{db: db}
|
||||
}
|
||||
|
||||
func (d *TokenDAO) GetByKey(key string) (*store.User, error) {
|
||||
var user store.User
|
||||
err := d.db.Where("username = ?", key).First(&user).Error
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return &user, nil
|
||||
}
|
||||
|
||||
func (d *TokenDAO) GetByID(id uint64) (*store.User, error) {
|
||||
var user store.User
|
||||
err := d.db.First(&user, id).Error
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return &user, nil
|
||||
}
|
||||
|
||||
// Placeholder to avoid compile errors - will be expanded in Phase 1
|
||||
var _ = errors.New
|
||||
var _ = gorm.ErrRecordNotFound
|
||||
@@ -0,0 +1,99 @@
|
||||
package dao
|
||||
|
||||
import (
|
||||
"context"
|
||||
"opencatd-open/internal/store"
|
||||
"time"
|
||||
|
||||
"gorm.io/gorm"
|
||||
"gorm.io/gorm/clause"
|
||||
)
|
||||
|
||||
type UsageDAO struct {
|
||||
db *gorm.DB
|
||||
}
|
||||
|
||||
type DailyUsageDAO struct {
|
||||
db *gorm.DB
|
||||
}
|
||||
|
||||
func NewUsageDAO(db *gorm.DB) *UsageDAO {
|
||||
return &UsageDAO{db: db}
|
||||
}
|
||||
|
||||
func NewDailyUsageDAO(db *gorm.DB) *DailyUsageDAO {
|
||||
return &DailyUsageDAO{db: db}
|
||||
}
|
||||
|
||||
// UsageLog DAO
|
||||
func (d *UsageDAO) Create(ctx context.Context, log *store.UsageLog) error {
|
||||
return d.db.WithContext(ctx).Create(log).Error
|
||||
}
|
||||
|
||||
func (d *UsageDAO) BatchCreate(ctx context.Context, logs []*store.UsageLog) error {
|
||||
return d.db.WithContext(ctx).Create(logs).Error
|
||||
}
|
||||
|
||||
func (d *UsageDAO) ListByUserID(ctx context.Context, userID uint64, limit, offset int) ([]*store.UsageLog, error) {
|
||||
var logs []*store.UsageLog
|
||||
err := d.db.WithContext(ctx).
|
||||
Where("user_id = ?", userID).
|
||||
Order("created_at DESC").
|
||||
Limit(limit).
|
||||
Offset(offset).
|
||||
Find(&logs).Error
|
||||
return logs, err
|
||||
}
|
||||
|
||||
func (d *UsageDAO) Delete(ctx context.Context, id uint64) error {
|
||||
return d.db.WithContext(ctx).Delete(&store.UsageLog{}, id).Error
|
||||
}
|
||||
|
||||
func (d *UsageDAO) CountByUserID(ctx context.Context, userID uint64) (int64, error) {
|
||||
var count int64
|
||||
err := d.db.WithContext(ctx).Model(&store.UsageLog{}).Where("user_id = ?", userID).Count(&count).Error
|
||||
return count, err
|
||||
}
|
||||
|
||||
// UsageDaily DAO
|
||||
func (d *DailyUsageDAO) Create(ctx context.Context, log *store.UsageDaily) error {
|
||||
return d.db.WithContext(ctx).Create(log).Error
|
||||
}
|
||||
|
||||
func (d *DailyUsageDAO) ListByUserID(ctx context.Context, userID uint64, limit, offset int) ([]*store.UsageDaily, error) {
|
||||
var logs []*store.UsageDaily
|
||||
err := d.db.WithContext(ctx).
|
||||
Where("user_id = ?", userID).
|
||||
Order("date DESC").
|
||||
Limit(limit).
|
||||
Offset(offset).
|
||||
Find(&logs).Error
|
||||
return logs, err
|
||||
}
|
||||
|
||||
func (d *DailyUsageDAO) GetByDate(ctx context.Context, userID uint64, date string) (*store.UsageDaily, error) {
|
||||
var log store.UsageDaily
|
||||
err := d.db.WithContext(ctx).
|
||||
Where("user_id = ? AND date = ?", userID, date).
|
||||
First(&log).Error
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return &log, nil
|
||||
}
|
||||
|
||||
func (d *DailyUsageDAO) UpsertDailyUsage(ctx context.Context, log *store.UsageDaily) error {
|
||||
return d.db.WithContext(ctx).Clauses(clause.OnConflict{
|
||||
Columns: []clause.Column{{Name: "user_id"}, {Name: "model_id"}, {Name: "date"}},
|
||||
DoUpdates: clause.AssignmentColumns([]string{"requests", "input_tokens", "output_tokens", "cache_read_tokens", "cost"}),
|
||||
}).Create(log).Error
|
||||
}
|
||||
|
||||
func (d *DailyUsageDAO) ListByDateRange(ctx context.Context, userID uint64, start, end time.Time) ([]*store.UsageDaily, error) {
|
||||
var logs []*store.UsageDaily
|
||||
err := d.db.WithContext(ctx).
|
||||
Where("user_id = ? AND date >= ? AND date <= ?", userID, start.Format("2006-01-02"), end.Format("2006-01-02")).
|
||||
Order("date DESC").
|
||||
Find(&logs).Error
|
||||
return logs, err
|
||||
}
|
||||
@@ -0,0 +1,62 @@
|
||||
package dao
|
||||
|
||||
import (
|
||||
"opencatd-open/internal/store"
|
||||
|
||||
"gorm.io/gorm"
|
||||
)
|
||||
|
||||
type UserDAO struct {
|
||||
db *gorm.DB
|
||||
}
|
||||
|
||||
func NewUserDAO(db *gorm.DB) *UserDAO {
|
||||
return &UserDAO{db: db}
|
||||
}
|
||||
|
||||
func (d *UserDAO) Create(user *store.User) error {
|
||||
return d.db.Create(user).Error
|
||||
}
|
||||
|
||||
func (d *UserDAO) GetByID(id uint64) (*store.User, error) {
|
||||
var user store.User
|
||||
err := d.db.First(&user, id).Error
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return &user, nil
|
||||
}
|
||||
|
||||
func (d *UserDAO) GetByUsername(username string) (*store.User, error) {
|
||||
var user store.User
|
||||
err := d.db.Where("username = ?", username).First(&user).Error
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return &user, nil
|
||||
}
|
||||
|
||||
func (d *UserDAO) GetByEmail(email string) (*store.User, error) {
|
||||
var user store.User
|
||||
err := d.db.Where("email = ?", email).First(&user).Error
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return &user, nil
|
||||
}
|
||||
|
||||
func (d *UserDAO) List(limit, offset int) ([]*store.User, int64, error) {
|
||||
var users []*store.User
|
||||
var total int64
|
||||
d.db.Model(&store.User{}).Count(&total)
|
||||
err := d.db.Limit(limit).Offset(offset).Order("created_at DESC").Find(&users).Error
|
||||
return users, total, err
|
||||
}
|
||||
|
||||
func (d *UserDAO) Update(user *store.User) error {
|
||||
return d.db.Save(user).Error
|
||||
}
|
||||
|
||||
func (d *UserDAO) Delete(id uint64) error {
|
||||
return d.db.Delete(&store.User{}, id).Error
|
||||
}
|
||||
Reference in New Issue
Block a user