Skip to content

fix: melhora a formatação e tratamento de erros na função getExistingSourceIds #1494

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
Merged
merged 3 commits into from
May 23, 2025
Merged

fix: melhora a formatação e tratamento de erros na função getExistingSourceIds #1494

merged 3 commits into from
May 23, 2025

Conversation

KokeroO
Copy link
Contributor

@KokeroO KokeroO commented May 23, 2025 •
edited by sourcery-ai bot
Loading

Problema

Mesmo após as correções de #1493 e #1490, em certas ocasiões continuou o erro:
bind message supplies 2 parameters, but prepared statement "" requires 1

Passou a ter o seguinte erro no banco de dados:
Error on import history messages: TypeError: Cannot read properties of null (reading 'has')

Solução

  • Criar um condição para ser somente informado a quantidade de parâmetros corretos.
  • has não lê valores null, então foi alterado a possibilidade de retorno do valor null em caso de acionamento do bloco catch

Summary by Sourcery

Fix parameter binding and error handling in getExistingSourceIds to prevent SQL parameter count mismatches and avoid returning null

Bug Fixes:

  • Dynamically build the SQL query and its parameters in getExistingSourceIds to match the correct number of placeholders
  • Return an empty Set instead of null in the catch block to prevent downstream TypeErrors

Enhancements:

  • Log errors encountered in getExistingSourceIds for better observability

Chores:

  • Remove redundant return 0 after message deletion

@sourcery-ai Sourcery AI
Copy link
Contributor

sourcery-ai bot commented May 23, 2025 •
edited
Loading

Reviewer's Guide

This PR refactors getExistingSourceIds to dynamically construct SQL parameters and query strings to match placeholders, adds error logging and returns an empty Set instead of null to prevent TypeErrors, and cleans up redundant code in the delete history flow.

File-Level Changes

Change Details Files
Refactor SQL query construction to avoid parameter mismatches
  • Introduce a params array that conditionally includes conversationId
  • Move query string assignment to align with params setup
  • Pass dynamic params array to pgClient.query
 src/api/integrations/chatbot/chatwoot/utils/chatwoot-import-helper.ts
Enhance error handling in getExistingSourceIds
  • Log caught errors with logger.error for better observability
  • Return an empty Set instead of null to prevent null reference exceptions
 src/api/integrations/chatbot/chatwoot/utils/chatwoot-import-helper.ts
Remove redundant return in delete history flow
  • Eliminate unnecessary return 0 after deleteHistoryMessages and cache cleanup
 src/api/integrations/chatbot/chatwoot/utils/chatwoot-import-helper.ts

Possibly linked issues

Tips and commands

Interacting with Sourcery

  • Trigger a new review: Comment @sourcery-ai review on the pull request.
  • Continue discussions: Reply directly to Sourcery's review comments.
  • Generate a GitHub issue from a review comment: Ask Sourcery to create an
    issue from a review comment by replying to it. You can also reply to a
    review comment with @sourcery-ai issue to create an issue from it.
  • Generate a pull request title: Write @sourcery-ai anywhere in the pull
    request title to generate a title at any time. You can also comment
    @sourcery-ai title on the pull request to (re-)generate the title at any time.
  • Generate a pull request summary: Write @sourcery-ai summary anywhere in
    the pull request body to generate a PR summary at any time exactly where you
    want it. You can also comment @sourcery-ai summary on the pull request to
    (re-)generate the summary at any time.
  • Generate reviewer's guide: Comment @sourcery-ai guide on the pull
    request to (re-)generate the reviewer's guide at any time.
  • Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
    pull request to resolve all Sourcery comments. Useful if you've already
    addressed all the comments and don't want to see them anymore.
  • Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
    request to dismiss all existing Sourcery reviews. Especially useful if you
    want to start fresh with a new review - don't forget to comment
    @sourcery-ai review to trigger a new review!

Customizing Your Experience

Access your dashboard to:

  • Enable or disable review features such as the Sourcery-generated pull request
    summary, the reviewer's guide, and others.
  • Change the review language.
  • Add, remove or edit custom review instructions.
  • Adjust other review settings.

Getting Help

@KokeroO
Copy link
Contributor Author

KokeroO commented May 23, 2025

@sourcery-ai review

sourcery-ai[bot]
sourcery-ai bot reviewed May 23, 2025
View reviewed changes
Copy link
Contributor

@sourcery-ai sourcery-ai bot left a comment

Choose a reason for hiding this comment

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

Hey @KokeroO - I've reviewed your changes and they look great!

Here's what I looked at during the review
  • 🟡 General issues: 2 issues found
  • 🟢 Security: all looks good
  • 🟢 Testing: all looks good
  • 🟢 Documentation: all looks good
Sourcery is free for open source - if you like our reviews please consider sharing them ✨
Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.

KokeroO
KokeroO commented May 23, 2025
View reviewed changes
src/api/integrations/chatbot/chatwoot/utils/chatwoot-import-helper.ts
@@ -336,7 +338,6 @@ class ChatwootImport {

this.deleteHistoryMessages(instance);
this.deleteRepositoryMessagesCache(instance);
return 0;
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@oriondesign2015 Não tem porque ter return 0 aqui. Ninguém espera retorno de importHistoryMessages

@KokeroO
Copy link
Contributor Author

KokeroO commented May 23, 2025

@sourcery-ai resolve

@DavidsonGomes DavidsonGomes merged commit 17fd407 into EvolutionAPI:develop May 23, 2025
1 check failed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sourcery-ai sourcery-ai[bot] sourcery-ai[bot] left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@KokeroO @DavidsonGomes