Skip to content

feat(api): add is_trashed field in get files route #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Blackmamoth merged 1 commit into from
Aug 22, 2025
Merged

feat(api): add is_trashed field in get files route #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions api/pkg/handlers/files.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ type GetFilesValidation struct {
Provider string `validate:"omitempty,oneof=google dropbox microsoft" json:"provider"`
ParentFolder string `validate:"omitempty" json:"parent_folder"`
Search string `validate:"omitempty" json:"search"`
IsTrashed bool `validate:"omitempty" json:"is_trashed"`
SortOn string `validate:"omitempty" json:"sort_on"`
SortBy string `validate:"omitempty" json:"sort_by"`
Limit int32 `validate:"omitempty" json:"limit"`
Expand Down Expand Up @@ -205,6 +206,7 @@ func (h *FilesHandler) getFiles(w http.ResponseWriter, r *http.Request) {
UserID: userID,
ParentFolder: db.PGTextField(payload.ParentFolder),
Provider: repository.ProviderEnum(payload.Provider),
IsTrashed: db.PGBool(payload.IsTrashed),
SortOn: payload.SortOn,
SortBy: payload.SortBy,
Search: payload.Search,
Expand All @@ -226,10 +228,12 @@ func (h *FilesHandler) getFiles(w http.ResponseWriter, r *http.Request) {
totalFileCount, err := queries.CountFilesWithFilters(
r.Context(),
repository.CountFilesWithFiltersParams{
UserID: userID,
ParentFolder: db.PGTextField(payload.ParentFolder),
Provider: repository.ProviderEnum(payload.Provider),
Search: payload.Search,
UserID: userID,
ParentFolder: db.PGTextField(payload.ParentFolder),
Provider: repository.ProviderEnum(payload.Provider),
Search: payload.Search,
IsTrashed: db.PGBool(payload.IsTrashed),
ProviderFileIds: providerFileIDs,
},
)
if err != nil {
Expand Down
42 changes: 24 additions & 18 deletions api/repository/synced_items.sql.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions api/sqlc/queries/synced_items.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ FROM synced_items
JOIN linked_account
ON linked_account.id = synced_items.account_id
WHERE linked_account.user_id = @user_id
AND is_trashed = @is_trashed
AND (NULLIF(@parent_folder, '') IS NULL OR synced_items.parent_folder = @parent_folder)
AND (NULLIF(@provider, '') IS NULL OR linked_account.provider = @provider::provider_enum)
AND (
Expand Down Expand Up @@ -65,6 +66,7 @@ FROM synced_items
JOIN linked_account
ON linked_account.id = synced_items.account_id
WHERE linked_account.user_id = @user_id
AND is_trashed = @is_trashed
AND (NULLIF(@parent_folder, '') IS NULL OR synced_items.parent_folder = @parent_folder)
AND (NULLIF(@provider, '') IS NULL OR linked_account.provider = @provider::provider_enum)
AND (NULLIF(@search, '') IS NULL OR synced_items.name ILIKE '%' || @search::TEXT || '%')
Expand Down
Loading