goto / guardian / 18910799942

66%

push

github

feat: refactor smart inactive grant filtering logic (#236)

* feat: refactor smart inactive grant filtering logic

Moved the logic for filtering out smart inactive grants from the Postgres repository layer to the service layer. Introduced NotIDs to ListGrantsFilter and updated the service to compute excluded grant IDs based on active/inactive status, ensuring only the latest inactive grant per resource is included when no active counterpart exists. Removed the corresponding SQL logic from the repository.

* Update grant_repository.go

* Exclude specific user grant IDs in total grants count

Updated GetGrantsTotalCount to generate and exclude user grant IDs for smart inactive grants. This ensures the total count reflects the intended filtered set by modifying the NotIDs filter before querying the repository.

* Refactor grant exclusion logic for smart inactive grants

Moved the logic for generating excluded user grant IDs for smart inactive grants from the core grant service methods to the API handler layer. Introduced the GenerateUserExcludedGrantIDsForSmartInactiveGrants method in the grant service interface and updated mocks accordingly. This change centralizes the exclusion logic and simplifies the core service methods.

* Refactor grant joins and sort unique summaries

Changed grant repository to remove unnecessary Preload calls and updated join types for resources and appeals. Also added sorting to the unique summaries generation to ensure consistent ordering of values.

* Refactor grant joins to use GORM associations

Updated the applyGrantsJoins function to use GORM association names ('Resource' and 'Appeal') instead of raw SQL JOIN statements for improved readability and maintainability.

* Refactor grant joins and preload logic in repository

Updated the List method to preload the Appeal relation instead of using a join. Separated join logic for listing and summary generation by introducing applyGrantsSummaryJoins, which joins both Resource a... (continued)

6 of 79 new or added lines in 5 files covered. (7.59%)

11489 of 16958 relevant lines covered (67.75%)

4.56 hits per line