Skip to content
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

Jump to bottom

Use DB StringDefs also in DAOs and methods where they are used #1252

Merged
merged 4 commits into from
Jan 22, 2025
Merged

Use DB StringDefs also in DAOs and methods where they are used #1252

merged 4 commits into from
Jan 22, 2025

Conversation

ArnyminerZ
Copy link
Member

Purpose

In #1225 we have introduced @StringDefs for database fields. We should also use them in function calls.

Short description

  • Annotated arguments that use the annotations in the DAOs.
  • Annotated all usages as well.

Checklist

  • The PR has a proper title, description and label.
  • I have self-reviewed the PR.
  • I have added documentation to complex functions and functions that can be used by other modules.
  • I have added reasonable tests or consciously decided to not add tests.

@ArnyminerZ ArnyminerZ added the refactoring Internal improvement of existing functions label Jan 20, 2025
@ArnyminerZ ArnyminerZ self-assigned this Jan 20, 2025
@ArnyminerZ ArnyminerZ linked an issue Jan 20, 2025 that may be closed by this pull request
Use DB StringDefs also in DAOs and methods where they are used #1239
Closed
@ArnyminerZ ArnyminerZ marked this pull request as ready for review January 20, 2025 12:14
@ArnyminerZ ArnyminerZ requested review from sunkup and rfc2822 January 20, 2025 12:14
@rfc2822
Copy link
Member

rfc2822 commented Jan 20, 2025

Conflict with main-ose, please merge again

@ArnyminerZ
Merge branch 'main-ose' into 1239-use-db-stringdefs-also-in-daos-and-…
40339a8 
…methods-where-they-are-used

# Conflicts:
#	app/src/main/kotlin/at/bitfire/davdroid/ui/account/GetServiceCollectionPagerUseCase.kt
@ArnyminerZ
Copy link
Member Author

Done 😄

sunkup
sunkup requested changes Jan 20, 2025
View reviewed changes
Copy link
Member

@sunkup sunkup left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think there is still AccountRepository.insertService?

Looks good otherwise.

@ArnyminerZ
Missing annotation
9600e1a 
Signed-off-by: Arnau Mora <[email protected]>
@ArnyminerZ ArnyminerZ requested a review from sunkup January 20, 2025 18:21
@rfc2822 rfc2822 merged commit 8b3c36f into main-ose Jan 22, 2025
8 checks passed
@rfc2822 rfc2822 deleted the 1239-use-db-stringdefs-also-in-daos-and-methods-where-they-are-used branch January 22, 2025 10:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sunkup sunkup sunkup approved these changes

@rfc2822 rfc2822 Awaiting requested review from rfc2822

Assignees

@ArnyminerZ ArnyminerZ

Labels
refactoring Internal improvement of existing functions
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Use DB StringDefs also in DAOs and methods where they are used
3 participants
@ArnyminerZ @rfc2822 @sunkup