bouzoure/pop-camarades
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge recent UI & Postgres work into main branch #4

Merged
bouzoure merged 19 commits from postgres into main 2025-07-24 12:13:01 +02:00
Conversation 0 Commits 19 Files changed 51 +4 -6
1 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 56fd3c0952 - Show all commits

10
helpers/database/people.go
View file

@ -45,11 +45,9 @@ func PeopleSearch(params PeopleSearchParams) (PeopleSearchResults, error) {
// SQL qeury for results // SQL qeury for results
sqlQuery := ` sqlQuery := `
SELECT people.*, SELECT people.*
sections.name AS Section__name
FROM people FROM people
INNER JOIN sections `
ON people.section_id = sections.id`
// SQL query to count results // SQL query to count results
sqlQueryCount := ` sqlQueryCount := `
@ -354,12 +352,12 @@ func PeopleSearch(params PeopleSearchParams) (PeopleSearchResults, error) {
%s %s
%s %s
%s %s
GROUP BY people.id, Section__name GROUP BY people.id
ORDER BY CONCAT(people.last_name, people.first_name) ASC ORDER BY CONCAT(people.last_name, people.first_name) ASC
%s %s
`, sqlQuery, sqlFieldJoins, sqlFilters, sqlPagination) `, sqlQuery, sqlFieldJoins, sqlFilters, sqlPagination)
sqlResult := db.Raw(sqlQuery, sqlParams...).Scan(&results.Results) sqlResult := db.Raw(sqlQuery, sqlParams...).Preload("Section").Find(&results.Results)
if sqlResult.Error != nil { if sqlResult.Error != nil {
return results, sqlResult.Error return results, sqlResult.Error
} }