refactor: shorten model and table prefixes

This commit is contained in:
2026-07-23 14:30:17 +08:00
parent 6e7be2f3a4
commit 0ca2898ac0
71 changed files with 707 additions and 638 deletions

View File

@@ -16,7 +16,7 @@ var (
ErrCronScheduleRequired = errors.New("cron schedule is required")
)
func (s *Service) CreateCronPlan(ownerID uint, projectID uint, input CreateCronPlanInput) (*models.SenlinAgentCronPlan, error) {
func (s *Service) CreateCronPlan(ownerID uint, projectID uint, input CreateCronPlanInput) (*models.SaCronPlan, error) {
if err := ensureProjectOwner(ownerID, projectID); err != nil {
return nil, err
}
@@ -28,34 +28,34 @@ func (s *Service) CreateCronPlan(ownerID uint, projectID uint, input CreateCronP
if schedule == "" {
return nil, ErrCronScheduleRequired
}
plan := &models.SenlinAgentCronPlan{
plan := &models.SaCronPlan{
ProjectID: projectID, CreatedBy: ownerID, Title: title, Schedule: schedule,
Enabled: input.Enabled, NextRunAt: input.NextRunAt,
}
return plan, models.DBService.Create(plan).Error
}
func (s *Service) CreateProjectTag(ownerID uint, projectID uint, name string) (*models.SenlinAgentTag, error) {
func (s *Service) CreateProjectTag(ownerID uint, projectID uint, name string) (*models.SaTag, error) {
if err := ensureProjectOwner(ownerID, projectID); err != nil {
return nil, err
}
return s.CreateTag(projectID, name)
}
func (s *Service) CreateTag(projectID uint, name string) (*models.SenlinAgentTag, error) {
func (s *Service) CreateTag(projectID uint, name string) (*models.SaTag, error) {
name = strings.TrimSpace(name)
if name == "" {
return nil, ErrTagNameRequired
}
var lastErr error
for attempt := 0; attempt < 5; attempt++ {
candidate := models.SenlinAgentTag{ProjectID: projectID, Name: name}
candidate := models.SaTag{ProjectID: projectID, Name: name}
lastErr = models.DBService.Clauses(clause.OnConflict{
Columns: []clause.Column{{Name: "project_id"}, {Name: "name"}},
DoNothing: true,
}).Create(&candidate).Error
if lastErr == nil {
var stored models.SenlinAgentTag
var stored models.SaTag
lastErr = models.DBService.Where("project_id = ? AND name = ?", projectID, name).First(&stored).Error
if lastErr == nil {
return &stored, nil
@@ -83,22 +83,22 @@ func retryableTagWrite(err error) bool {
return false
}
func (s *Service) ListProjectTags(ownerID uint, projectID uint) ([]models.SenlinAgentTag, error) {
func (s *Service) ListProjectTags(ownerID uint, projectID uint) ([]models.SaTag, error) {
if err := ensureProjectOwner(ownerID, projectID); err != nil {
return nil, err
}
return s.ListTags(projectID)
}
func (s *Service) ListTags(projectID uint) ([]models.SenlinAgentTag, error) {
var tags []models.SenlinAgentTag
func (s *Service) ListTags(projectID uint) ([]models.SaTag, error) {
var tags []models.SaTag
err := models.DBService.Where("project_id = ?", projectID).Order("name asc").Find(&tags).Error
return tags, err
}
func ensureProjectOwner(ownerID uint, projectID uint) error {
var count int64
if err := models.DBService.Model(&models.SenlinAgentProject{}).Where("id = ? AND owner_id = ?", projectID, ownerID).Count(&count).Error; err != nil {
if err := models.DBService.Model(&models.SaProject{}).Where("id = ? AND owner_id = ?", projectID, ownerID).Count(&count).Error; err != nil {
return err
}
if count == 0 {