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.

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

fix(j-s): DB Queries #16045

Merged
merged 3 commits into from
Sep 19, 2024
Merged

fix(j-s): DB Queries #16045

merged 3 commits into from
Sep 19, 2024

Conversation

gudjong
Copy link
Member

@gudjong gudjong commented Sep 18, 2024

DB Queries

Skila öllum varnaraðilum með málum

What

  • Returns all defendants with defender case list query.
  • Returns all defendants and the district court with merge list query.
  • Filters out cases client side that have multiple defendants or a differenct district court when merging cases.
  • Improves national id matching by both normalizing and formatting national ids.

Why

  • Verified bugs.

Checklist:

  • I have performed a self-review of my own code
  • I have made corresponding changes to the documentation
  • My changes generate no new warnings
  • I have added tests that prove my fix is effective or that my feature works
  • Formatting passes locally with my changes
  • I have rebased against main before asking for a review

Summary by CodeRabbit

  • New Features

    • Enhanced national ID handling for improved case querying and access control.
    • Introduced a new function to normalize and format national IDs, improving flexibility in ID processing.
  • Bug Fixes

    • Updated logic for filtering connected cases to ensure only valid cases are selected for merging.
  • Tests

    • Added a test suite for the new national ID normalization and formatting function to ensure robustness.
  • Documentation

    • Improved comments and clarity in the code related to national ID processing and querying.

@gudjong gudjong requested a review from a team as a code owner September 18, 2024 08:21
Copy link
Contributor

coderabbitai bot commented Sep 18, 2024

Walkthrough

The changes primarily focus on improving the handling of national IDs in the judicial system application. The LimitedAccessCaseService class has been updated to replace the formatNationalId function with normalizeAndFormatNationalId, enhancing the processing of national IDs when searching for defenders. This update simplifies the code by directly using the new function's output in database queries.

Changes

File Change Summary
apps/judicial-system/backend/src/app/modules/case/limitedAccessCase.service.ts Updated national ID processing in findDefenderByNationalId method to use normalizeAndFormatNationalId.

Possibly related PRs

Suggested labels

automerge

Suggested reviewers

  • oddsson

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

Share
Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    -- I pushed a fix in commit <commit_id>, please review it.
    -- Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    -- @coderabbitai generate unit testing code for this file.
    -- @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    -- @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    -- @coderabbitai read src/utils.ts and generate unit testing code.
    -- @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    -- @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 11

Review details

Configuration used: .coderabbit.yaml
Review profile: CHILL

Commits

Files that changed from the base of the PR and between 43a8006 and e692d32.

Files selected for processing (13)
  • apps/judicial-system/backend/src/app/modules/case/case.service.ts (2 hunks)
  • apps/judicial-system/backend/src/app/modules/case/filters/case.filter.ts (2 hunks)
  • apps/judicial-system/backend/src/app/modules/case/filters/cases.filter.ts (5 hunks)
  • apps/judicial-system/backend/src/app/modules/case/filters/test/cases.filter.spec.ts (1 hunks)
  • apps/judicial-system/backend/src/app/modules/case/internalCase.service.ts (3 hunks)
  • apps/judicial-system/backend/src/app/modules/case/limitedAccessCase.service.ts (2 hunks)
  • apps/judicial-system/backend/src/app/modules/case/test/limitedAccessCaseController/findDefenderByNationalId.spec.ts (1 hunks)
  • apps/judicial-system/backend/src/app/modules/defendant/defendant.service.ts (2 hunks)
  • apps/judicial-system/digital-mailbox-api/src/app/modules/cases/models/subpoena.response.ts (2 hunks)
  • apps/judicial-system/web/src/components/CourtArrangements/CourtArrangements.tsx (1 hunks)
  • apps/judicial-system/web/src/routes/Court/Indictments/Conclusion/SelectConnectedCase.tsx (1 hunks)
  • libs/judicial-system/formatters/src/lib/formatters.spec.ts (2 hunks)
  • libs/judicial-system/formatters/src/lib/formatters.ts (1 hunks)
Additional context used
Path-based instructions (13)
apps/judicial-system/web/src/routes/Court/Indictments/Conclusion/SelectConnectedCase.tsx (1)

Pattern apps/**/*: "Confirm that the code adheres to the following:

  • NextJS best practices, including file structure, API routes, and static generation methods.
  • Efficient state management and server-side rendering techniques.
  • Optimal use of TypeScript for component and utility type safety."
apps/judicial-system/digital-mailbox-api/src/app/modules/cases/models/subpoena.response.ts (1)

Pattern apps/**/*: "Confirm that the code adheres to the following:

  • NextJS best practices, including file structure, API routes, and static generation methods.
  • Efficient state management and server-side rendering techniques.
  • Optimal use of TypeScript for component and utility type safety."
apps/judicial-system/backend/src/app/modules/case/test/limitedAccessCaseController/findDefenderByNationalId.spec.ts (1)

Pattern apps/**/*: "Confirm that the code adheres to the following:

  • NextJS best practices, including file structure, API routes, and static generation methods.
  • Efficient state management and server-side rendering techniques.
  • Optimal use of TypeScript for component and utility type safety."
apps/judicial-system/web/src/components/CourtArrangements/CourtArrangements.tsx (1)

Pattern apps/**/*: "Confirm that the code adheres to the following:

  • NextJS best practices, including file structure, API routes, and static generation methods.
  • Efficient state management and server-side rendering techniques.
  • Optimal use of TypeScript for component and utility type safety."
apps/judicial-system/backend/src/app/modules/case/filters/cases.filter.ts (1)

Pattern apps/**/*: "Confirm that the code adheres to the following:

  • NextJS best practices, including file structure, API routes, and static generation methods.
  • Efficient state management and server-side rendering techniques.
  • Optimal use of TypeScript for component and utility type safety."
apps/judicial-system/backend/src/app/modules/case/filters/case.filter.ts (1)

Pattern apps/**/*: "Confirm that the code adheres to the following:

  • NextJS best practices, including file structure, API routes, and static generation methods.
  • Efficient state management and server-side rendering techniques.
  • Optimal use of TypeScript for component and utility type safety."
apps/judicial-system/backend/src/app/modules/defendant/defendant.service.ts (1)

Pattern apps/**/*: "Confirm that the code adheres to the following:

  • NextJS best practices, including file structure, API routes, and static generation methods.
  • Efficient state management and server-side rendering techniques.
  • Optimal use of TypeScript for component and utility type safety."
libs/judicial-system/formatters/src/lib/formatters.spec.ts (1)

Pattern libs/**/*: "Confirm that the code adheres to the following:

  • Reusability of components and hooks across different NextJS apps.
  • TypeScript usage for defining props and exporting types.
  • Effective tree-shaking and bundling practices."
apps/judicial-system/backend/src/app/modules/case/filters/test/cases.filter.spec.ts (1)

Pattern apps/**/*: "Confirm that the code adheres to the following:

  • NextJS best practices, including file structure, API routes, and static generation methods.
  • Efficient state management and server-side rendering techniques.
  • Optimal use of TypeScript for component and utility type safety."
libs/judicial-system/formatters/src/lib/formatters.ts (1)

Pattern libs/**/*: "Confirm that the code adheres to the following:

  • Reusability of components and hooks across different NextJS apps.
  • TypeScript usage for defining props and exporting types.
  • Effective tree-shaking and bundling practices."
apps/judicial-system/backend/src/app/modules/case/limitedAccessCase.service.ts (1)

Pattern apps/**/*: "Confirm that the code adheres to the following:

  • NextJS best practices, including file structure, API routes, and static generation methods.
  • Efficient state management and server-side rendering techniques.
  • Optimal use of TypeScript for component and utility type safety."
apps/judicial-system/backend/src/app/modules/case/internalCase.service.ts (1)

Pattern apps/**/*: "Confirm that the code adheres to the following:

  • NextJS best practices, including file structure, API routes, and static generation methods.
  • Efficient state management and server-side rendering techniques.
  • Optimal use of TypeScript for component and utility type safety."
apps/judicial-system/backend/src/app/modules/case/case.service.ts (1)

Pattern apps/**/*: "Confirm that the code adheres to the following:

  • NextJS best practices, including file structure, API routes, and static generation methods.
  • Efficient state management and server-side rendering techniques.
  • Optimal use of TypeScript for component and utility type safety."
Learnings (1)
apps/judicial-system/web/src/routes/Court/Indictments/Conclusion/SelectConnectedCase.tsx (1)
Learnt from: unakb
PR: island-is/island.is#15378
File: apps/judicial-system/web/src/routes/Court/Indictments/Summary/Summary.tsx:86-100
Timestamp: 2024-06-27T14:37:07.823Z
Learning: User unakb prefers explicit case handling in switch statements for key functionalities like `getRulingDecisionTagColor` to ensure clarity and avoid assumptions that a case was overlooked.
Additional comments not posted (8)
apps/judicial-system/web/src/routes/Court/Indictments/Conclusion/SelectConnectedCase.tsx (1)

44-55: LGTM!

The filtering logic correctly filters connected cases to those with a single defendant and matching court IDs. This ensures that only eligible cases are available for merging, aligning with the requirement.

apps/judicial-system/backend/src/app/modules/case/test/limitedAccessCaseController/findDefenderByNationalId.spec.ts (1)

78-78: LGTM!

The test correctly verifies that the findOne method is called with the correct query parameters, checking both the unformatted and formatted defender national IDs.

apps/judicial-system/web/src/components/CourtArrangements/CourtArrangements.tsx (1)

84-84: Verify server compatibility with ISO date format.

The date is now being converted using date.toISOString(). Ensure that the server accepts and correctly parses ISO 8601 formatted strings. If the server expects a specific date format, consider updating the server or utilizing a date formatting function that matches the expected format.

apps/judicial-system/backend/src/app/modules/case/filters/case.filter.ts (1)

333-345: Ensure normalizeAndFormatNationalId returns an array for proper usage with includes.

Verify that normalizeAndFormatNationalId returns an array of national ID variations. Using includes assumes that the return value is an array where each element can be compared to defendant.defenderNationalId. Confirm that this comparison accurately determines access rights based on national ID.

apps/judicial-system/backend/src/app/modules/defendant/defendant.service.ts (1)

14-14: Importing Correct Function normalizeAndFormatNationalId

The import statement correctly updates the imported function to normalizeAndFormatNationalId, which aligns with the changes in the formatter utilities.

apps/judicial-system/backend/src/app/modules/case/case.service.ts (3)

23-23: Import of normalizeAndFormatNationalId is appropriate

The normalizeAndFormatNationalId function is correctly imported for use in normalizing national IDs for defendant matching.


1358-1363: Initialization of whereClause with appropriate conditions

The initial conditions for the whereClause array are well-defined, ensuring that only relevant indictment cases are retrieved.


1393-1397: Ensure Replacements are Passed to Query Execution

If using bind parameters for the whereClause, ensure that the replacements object is passed to the findAll method to prevent errors.

Please confirm that the replacements object is correctly passed to the findAll method when using bind parameters.

Copy link

codecov bot commented Sep 18, 2024

Codecov Report

Attention: Patch coverage is 73.91304% with 6 lines in your changes missing coverage. Please review.

Project coverage is 36.75%. Comparing base (ca6099e) to head (d3fa2e3).
Report is 1 commits behind head on main.

Files with missing lines Patch % Lines
...urt/Indictments/Conclusion/SelectConnectedCase.tsx 0.00% 4 Missing ⚠️
...ystem/backend/src/app/modules/case/case.service.ts 80.00% 1 Missing ⚠️
...components/CourtArrangements/CourtArrangements.tsx 0.00% 1 Missing ⚠️
Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##             main   #16045      +/-   ##
==========================================
+ Coverage   36.73%   36.75%   +0.02%     
==========================================
  Files        6735     6733       -2     
  Lines      138318   138111     -207     
  Branches    39339    39248      -91     
==========================================
- Hits        50812    50768      -44     
+ Misses      87506    87343     -163     
Flag Coverage Δ
judicial-system-api 19.40% <ø> (ø)
judicial-system-backend 55.22% <94.44%> (+0.01%) ⬆️
judicial-system-formatters 79.76% <100.00%> (+0.07%) ⬆️
judicial-system-web 28.70% <12.50%> (-0.01%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files with missing lines Coverage Δ
...ackend/src/app/modules/case/filters/case.filter.ts 91.03% <100.00%> (ø)
...ckend/src/app/modules/case/filters/cases.filter.ts 97.91% <100.00%> (ø)
...ckend/src/app/modules/case/internalCase.service.ts 85.08% <ø> (+0.37%) ⬆️
.../src/app/modules/case/limitedAccessCase.service.ts 71.81% <100.00%> (-0.26%) ⬇️
...end/src/app/modules/defendant/defendant.service.ts 82.55% <100.00%> (+0.94%) ⬆️
...s/judicial-system/formatters/src/lib/formatters.ts 80.00% <100.00%> (+0.32%) ⬆️
...ystem/backend/src/app/modules/case/case.service.ts 90.64% <80.00%> (ø)
...components/CourtArrangements/CourtArrangements.tsx 4.08% <0.00%> (ø)
...urt/Indictments/Conclusion/SelectConnectedCase.tsx 0.00% <0.00%> (ø)

... and 40 files with indirect coverage changes


Continue to review full report in Codecov by Sentry.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update ca6099e...d3fa2e3. Read the comment docs.

@datadog-island-is
Copy link

Datadog Report

All test runs d30741f 🔗

5 Total Test Services: 0 Failed, 5 Passed
🔻 Test Sessions change in coverage: 1 decreased (-0.04%), 1 increased (+0.03%), 4 no change

Test Services
Service Name Failed Known Flaky New Flaky Passed Skipped Total Time Code Coverage Change Test Service View
judicial-system-api 0 0 0 57 0 6.28s 1 no change Link
judicial-system-backend 0 0 0 21228 0 19m 53.81s 1 no change Link
judicial-system-formatters 0 0 0 38 0 5.41s 1 increased (+0.03%) Link
judicial-system-web 0 0 0 338 0 1m 9.35s 1 no change Link
judicial-system-xrd-api 0 0 0 6 0 5.26s 1 decreased (-0.04%) Link

🔻 Code Coverage Decreases vs Default Branch (1)

  • judicial-system-xrd-api - jest 74.07% (-0.04%) - Details

Copy link
Member

@unakb unakb left a comment

Choose a reason for hiding this comment

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

This looks good, there's a lot of rabbit comments so might have another look over once those are resolved but I'll approve 😊

@gudjong gudjong added the automerge Merge this PR as soon as all checks pass label Sep 18, 2024
@kodiakhq kodiakhq bot merged commit 3594b6d into main Sep 19, 2024
33 checks passed
@kodiakhq kodiakhq bot deleted the j-s/fix-db-queries branch September 19, 2024 07:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automerge Merge this PR as soon as all checks pass
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants