refactor(store): replace project and skill models with generated models
Some checks failed
CI / build-and-test (push) Failing after -31m25s
Some checks failed
CI / build-and-test (push) Failing after -31m25s
* Update project creation and retrieval to use generated models * Modify skill addition and listing to utilize generated models * Refactor thought handling to incorporate generated models * Adjust tool annotations to align with new model structure * Update API calls in the UI to use new ResolveSpec-based endpoints * Enhance stats retrieval logic to aggregate thought metadata
This commit is contained in:
@@ -8,6 +8,7 @@ import (
|
||||
|
||||
"github.com/google/uuid"
|
||||
|
||||
"git.warky.dev/wdevs/amcs/internal/generatedmodels"
|
||||
ext "git.warky.dev/wdevs/amcs/internal/types"
|
||||
)
|
||||
|
||||
@@ -19,9 +20,12 @@ func (db *DB) AddFamilyMember(ctx context.Context, m ext.FamilyMember) (ext.Fami
|
||||
`, m.Name, nullStr(m.Relationship), m.BirthDate, nullStr(m.Notes))
|
||||
|
||||
created := m
|
||||
if err := row.Scan(&created.ID, &created.CreatedAt); err != nil {
|
||||
var model generatedmodels.ModelPublicFamilyMembers
|
||||
if err := row.Scan(&model.ID, &model.CreatedAt); err != nil {
|
||||
return ext.FamilyMember{}, fmt.Errorf("insert family member: %w", err)
|
||||
}
|
||||
created.ID = model.ID.UUID()
|
||||
created.CreatedAt = model.CreatedAt.Time()
|
||||
return created, nil
|
||||
}
|
||||
|
||||
@@ -34,14 +38,11 @@ func (db *DB) ListFamilyMembers(ctx context.Context) ([]ext.FamilyMember, error)
|
||||
|
||||
var members []ext.FamilyMember
|
||||
for rows.Next() {
|
||||
var m ext.FamilyMember
|
||||
var relationship, notes *string
|
||||
if err := rows.Scan(&m.ID, &m.Name, &relationship, &m.BirthDate, ¬es, &m.CreatedAt); err != nil {
|
||||
var model generatedmodels.ModelPublicFamilyMembers
|
||||
if err := rows.Scan(&model.ID, &model.Name, &model.Relationship, &model.BirthDate, &model.Notes, &model.CreatedAt); err != nil {
|
||||
return nil, fmt.Errorf("scan family member: %w", err)
|
||||
}
|
||||
m.Relationship = strVal(relationship)
|
||||
m.Notes = strVal(notes)
|
||||
members = append(members, m)
|
||||
members = append(members, familyMemberFromModel(model))
|
||||
}
|
||||
return members, rows.Err()
|
||||
}
|
||||
@@ -56,9 +57,12 @@ func (db *DB) AddActivity(ctx context.Context, a ext.Activity) (ext.Activity, er
|
||||
nullStr(a.Location), nullStr(a.Notes))
|
||||
|
||||
created := a
|
||||
if err := row.Scan(&created.ID, &created.CreatedAt); err != nil {
|
||||
var model generatedmodels.ModelPublicActivities
|
||||
if err := row.Scan(&model.ID, &model.CreatedAt); err != nil {
|
||||
return ext.Activity{}, fmt.Errorf("insert activity: %w", err)
|
||||
}
|
||||
created.ID = model.ID.UUID()
|
||||
created.CreatedAt = model.CreatedAt.Time()
|
||||
return created, nil
|
||||
}
|
||||
|
||||
@@ -129,9 +133,12 @@ func (db *DB) AddImportantDate(ctx context.Context, d ext.ImportantDate) (ext.Im
|
||||
`, d.FamilyMemberID, d.Title, d.DateValue, d.RecurringYearly, d.ReminderDaysBefore, nullStr(d.Notes))
|
||||
|
||||
created := d
|
||||
if err := row.Scan(&created.ID, &created.CreatedAt); err != nil {
|
||||
var model generatedmodels.ModelPublicImportantDates
|
||||
if err := row.Scan(&model.ID, &model.CreatedAt); err != nil {
|
||||
return ext.ImportantDate{}, fmt.Errorf("insert important date: %w", err)
|
||||
}
|
||||
created.ID = model.ID.UUID()
|
||||
created.CreatedAt = model.CreatedAt.Time()
|
||||
return created, nil
|
||||
}
|
||||
|
||||
@@ -164,17 +171,13 @@ func (db *DB) GetUpcomingDates(ctx context.Context, daysAhead int) ([]ext.Import
|
||||
|
||||
var dates []ext.ImportantDate
|
||||
for rows.Next() {
|
||||
var d ext.ImportantDate
|
||||
var memberID *uuid.UUID
|
||||
var memberName, notes *string
|
||||
if err := rows.Scan(&d.ID, &memberID, &memberName, &d.Title, &d.DateValue,
|
||||
&d.RecurringYearly, &d.ReminderDaysBefore, ¬es, &d.CreatedAt); err != nil {
|
||||
var model generatedmodels.ModelPublicImportantDates
|
||||
var memberName *string
|
||||
if err := rows.Scan(&model.ID, &model.FamilyMemberID, &memberName, &model.Title, &model.DateValue,
|
||||
&model.RecurringYearly, &model.ReminderDaysBefore, &model.Notes, &model.CreatedAt); err != nil {
|
||||
return nil, fmt.Errorf("scan important date: %w", err)
|
||||
}
|
||||
d.FamilyMemberID = memberID
|
||||
d.MemberName = strVal(memberName)
|
||||
d.Notes = strVal(notes)
|
||||
dates = append(dates, d)
|
||||
dates = append(dates, importantDateFromModel(model, strVal(memberName)))
|
||||
}
|
||||
return dates, rows.Err()
|
||||
}
|
||||
@@ -188,23 +191,16 @@ func scanActivities(rows interface {
|
||||
defer rows.Close()
|
||||
var activities []ext.Activity
|
||||
for rows.Next() {
|
||||
var a ext.Activity
|
||||
var memberName, activityType, dayOfWeek, startTime, endTime, location, notes *string
|
||||
var model generatedmodels.ModelPublicActivities
|
||||
var memberName *string
|
||||
if err := rows.Scan(
|
||||
&a.ID, &a.FamilyMemberID, &memberName, &a.Title, &activityType,
|
||||
&dayOfWeek, &startTime, &endTime,
|
||||
&a.StartDate, &a.EndDate, &location, ¬es, &a.CreatedAt,
|
||||
&model.ID, &model.FamilyMemberID, &memberName, &model.Title, &model.ActivityType,
|
||||
&model.DayOfWeek, &model.StartTime, &model.EndTime,
|
||||
&model.StartDate, &model.EndDate, &model.Location, &model.Notes, &model.CreatedAt,
|
||||
); err != nil {
|
||||
return nil, fmt.Errorf("scan activity: %w", err)
|
||||
}
|
||||
a.MemberName = strVal(memberName)
|
||||
a.ActivityType = strVal(activityType)
|
||||
a.DayOfWeek = strVal(dayOfWeek)
|
||||
a.StartTime = strVal(startTime)
|
||||
a.EndTime = strVal(endTime)
|
||||
a.Location = strVal(location)
|
||||
a.Notes = strVal(notes)
|
||||
activities = append(activities, a)
|
||||
activities = append(activities, activityFromModel(model, strVal(memberName)))
|
||||
}
|
||||
return activities, rows.Err()
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user