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

Utiliser les FAR plutôt que les DEP pour déterminer les engins de la marée #3088

Merged
merged 1 commit into from
Apr 4, 2024

Conversation

VincentAntoine
Copy link
Collaborator

@VincentAntoine VincentAntoine commented Apr 4, 2024

Linked issues

Summary by CodeRabbit

  • New Features
    • Enhanced the fishing catch data structure to include new fields such as mesh and dimensions, providing more detailed information on catches.
  • Refactor
    • Improved data retrieval and processing for fishing activities by restructuring queries and aggregating gear information.

@VincentAntoine VincentAntoine changed the title Use FAR instead of DEP to determine gear_onboard Utiliser les FAR plutôt que les DEP pour déterminer les engins de la marée Apr 4, 2024
@MTES-MCT MTES-MCT deleted a comment from coderabbitai bot Apr 4, 2024
Copy link

sonarcloud bot commented Apr 4, 2024

Quality Gate Passed Quality Gate passed

Issues
1 New issue
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
0.0% Duplication on New Code

See analysis details on SonarCloud

@VincentAntoine VincentAntoine merged commit ae5c6ec into master Apr 4, 2024
8 checks passed
@VincentAntoine VincentAntoine deleted the vincent/use_far_gears_instead_of_dep_gears branch April 4, 2024 16:02
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: 1

Review Status

Configuration used: CodeRabbit UI

Commits Files that changed from the base of the PR and between c9a1ca8 and 285dc41.
Files selected for processing (2)
  • datascience/src/pipeline/queries/monitorfish/current_catches.sql (6 hunks)
  • datascience/tests/test_pipeline/test_flows/test_current_segments.py (1 hunks)
Additional comments not posted (2)
datascience/src/pipeline/queries/monitorfish/current_catches.sql (1)

81-92: Ensure the DISTINCT keyword in the aggregation of gear_onboard is necessary and correctly applied. If gear, mesh, and dimensions combinations are unique per cfr, the DISTINCT keyword is redundant and can be removed for performance optimization.

- jsonb_agg(DISTINCT 
+ jsonb_agg(
datascience/tests/test_pipeline/test_flows/test_current_segments.py (1)

41-42: Ensure the addition of the "dimensions" key with a value of None aligns with the expected data schema and handling in the application logic. If dimensions is expected to be a numeric value or a specific format, consider adjusting the test setup accordingly.

Comment on lines +54 to +55
((jsonb_array_elements(r.value -> 'hauls'))->>'mesh')::DOUBLE PRECISION as mesh,
(jsonb_array_elements(r.value -> 'hauls'))->>'dimensions' as dimensions,
Copy link
Contributor

Choose a reason for hiding this comment

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

Consider adding NULL checks for mesh and dimensions fields to handle potential missing data gracefully.

- ((jsonb_array_elements(r.value -> 'hauls'))->>'mesh')::DOUBLE PRECISION as mesh,
- (jsonb_array_elements(r.value -> 'hauls'))->>'dimensions' as dimensions,
+ COALESCE(((jsonb_array_elements(r.value -> 'hauls'))->>'mesh')::DOUBLE PRECISION, 0) as mesh,
+ COALESCE((jsonb_array_elements(r.value -> 'hauls'))->>'dimensions', 'N/A') as dimensions,

Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation.

Suggested change
((jsonb_array_elements(r.value -> 'hauls'))->>'mesh')::DOUBLE PRECISION as mesh,
(jsonb_array_elements(r.value -> 'hauls'))->>'dimensions' as dimensions,
COALESCE(((jsonb_array_elements(r.value -> 'hauls'))->>'mesh')::DOUBLE PRECISION, 0) as mesh,
COALESCE((jsonb_array_elements(r.value -> 'hauls'))->>'dimensions', 'N/A') as dimensions,

Copy link
Contributor

coderabbitai bot commented Apr 4, 2024

Walkthrough

This update primarily focuses on refining the data handling for fishing activities, particularly by adjusting how fishing gear data is captured and represented. Changes include the removal of gear_onboard from certain queries, the addition of new attributes like mesh and dimensions for better catch descriptions, and the consolidation of gear information. These modifications aim to streamline data processing and enhance the accuracy of fishing activity records.

Changes

File Path Change Summary
.../queries/monitorfish/current_catches.sql Removed gear_onboard, added mesh and dimensions fields, aggregated gear information.
.../test_pipeline/test_flows/test_current_segments.py Added a "dimensions" key with None value to gear_onboard list.

Assessment against linked issues

Objective Addressed Explanation
Missions - Prendre les engins dans les FAR plutôt que dans le DEP (#2061)

🐇✨

In the sea, so vast and wide,
A change was made with care and pride.
No more confusion, clear as day,
The gear we track, in a better way.
With mesh and dimensions, now we see,
A clearer picture of the sea. 🌊

🐾📊

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>.
    • 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 generate interesting stats about this repository and render them as a table.
    • @coderabbitai show all the console.log statements in this repository.
    • @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.

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 as PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger a review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai help to get help.

Additionally, you can add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.

CodeRabbit Configration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/coderabbit-overrides.v2.json

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Missions - Prendre les engins dans les FAR plutôt que dans le DEP
1 participant