refactor: shorten model and table prefixes
This commit is contained in:
@@ -60,7 +60,7 @@ func (s *Service) Search(userID uint, query string) ([]SearchResultDTO, error) {
|
||||
operator = "ILIKE"
|
||||
}
|
||||
|
||||
var projects []models.SenlinAgentProject
|
||||
var projects []models.SaProject
|
||||
projectFilter := fmt.Sprintf("owner_id = ? AND (name %s ? ESCAPE '!' OR description %s ? ESCAPE '!')", operator, operator)
|
||||
if err := s.database().Where(projectFilter, userID, like, like).
|
||||
Order("updated_at DESC").Order("identity ASC").
|
||||
@@ -75,11 +75,11 @@ func (s *Service) Search(userID uint, query string) ([]SearchResultDTO, error) {
|
||||
})
|
||||
}
|
||||
|
||||
var tasks []models.SenlinAgentTask
|
||||
taskFilter := fmt.Sprintf("(senlin_agent_projects.owner_id = ? OR senlin_agent_tasks.assignee_id = ?) AND (senlin_agent_tasks.title %s ? ESCAPE '!' OR senlin_agent_tasks.description %s ? ESCAPE '!')", operator, operator)
|
||||
if err := s.database().Select("senlin_agent_tasks.*").Joins("JOIN senlin_agent_projects ON senlin_agent_projects.id = senlin_agent_tasks.project_id").
|
||||
var tasks []models.SaTask
|
||||
taskFilter := fmt.Sprintf("(sa_projects.owner_id = ? OR sa_tasks.assignee_id = ?) AND (sa_tasks.title %s ? ESCAPE '!' OR sa_tasks.description %s ? ESCAPE '!')", operator, operator)
|
||||
if err := s.database().Select("sa_tasks.*").Joins("JOIN sa_projects ON sa_projects.id = sa_tasks.project_id").
|
||||
Where(taskFilter, userID, userID, like, like).
|
||||
Order("senlin_agent_tasks.updated_at DESC").Order("senlin_agent_tasks.identity ASC").
|
||||
Order("sa_tasks.updated_at DESC").Order("sa_tasks.identity ASC").
|
||||
Limit(maxSearchResults).
|
||||
Find(&tasks).Error; err != nil {
|
||||
return nil, err
|
||||
@@ -92,18 +92,18 @@ func (s *Service) Search(userID uint, query string) ([]SearchResultDTO, error) {
|
||||
})
|
||||
}
|
||||
|
||||
var notes []models.SenlinAgentNote
|
||||
noteFilter := fmt.Sprintf(`(senlin_agent_projects.owner_id = ? OR EXISTS (
|
||||
SELECT 1 FROM senlin_agent_task_shares
|
||||
JOIN senlin_agent_tasks ON senlin_agent_tasks.id = senlin_agent_task_shares.task_id
|
||||
WHERE senlin_agent_task_shares.object_type = 'note'
|
||||
AND senlin_agent_task_shares.object_id = senlin_agent_notes.id
|
||||
AND senlin_agent_tasks.project_id = senlin_agent_notes.project_id
|
||||
AND senlin_agent_tasks.assignee_id = ?
|
||||
)) AND (senlin_agent_notes.title %s ? ESCAPE '!' OR senlin_agent_notes.markdown %s ? ESCAPE '!')`, operator, operator)
|
||||
if err := s.database().Select("senlin_agent_notes.*").Joins("JOIN senlin_agent_projects ON senlin_agent_projects.id = senlin_agent_notes.project_id").
|
||||
var notes []models.SaNote
|
||||
noteFilter := fmt.Sprintf(`(sa_projects.owner_id = ? OR EXISTS (
|
||||
SELECT 1 FROM sa_task_shares
|
||||
JOIN sa_tasks ON sa_tasks.id = sa_task_shares.task_id
|
||||
WHERE sa_task_shares.object_type = 'note'
|
||||
AND sa_task_shares.object_id = sa_notes.id
|
||||
AND sa_tasks.project_id = sa_notes.project_id
|
||||
AND sa_tasks.assignee_id = ?
|
||||
)) AND (sa_notes.title %s ? ESCAPE '!' OR sa_notes.markdown %s ? ESCAPE '!')`, operator, operator)
|
||||
if err := s.database().Select("sa_notes.*").Joins("JOIN sa_projects ON sa_projects.id = sa_notes.project_id").
|
||||
Where(noteFilter, userID, userID, like, like).
|
||||
Order("senlin_agent_notes.updated_at DESC").Order("senlin_agent_notes.identity ASC").
|
||||
Order("sa_notes.updated_at DESC").Order("sa_notes.identity ASC").
|
||||
Limit(maxSearchResults).
|
||||
Find(¬es).Error; err != nil {
|
||||
return nil, err
|
||||
|
||||
Reference in New Issue
Block a user