Skip to content

Corrige filtro de mensagens com OR dinâmico #1780

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

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from

Conversation

anderecc
Copy link

@anderecc anderecc commented Jul 30, 2025

Adicionado operador OR em "prismaRepository.message.count" e "prismaRepository.message.findMany" para filtrar as mensagens de um contato por "remoteJid" ou "senderPn".

Essa atualização serve para ajudar a buscar as mensagens do cliente que vem com o campo "remoteJid" com @lid.
Essa atualização permite trazer os resultados mais corretos para o filtro de mensagem, sem deixar as mensagens com senderPn que deveriam ter o padrão @WhatsApp que vinha antes em remoteJid.

Essa atualização busca com o where da seguinte forma:
where: {
key: {
remoteJid: '',
senderPn: '',
},
}

Acredito que sirva para mais pessoas essa att, outra forma seria nem passar o senderPn no where e colocar direto no método de count ou findMany... Mas dessa forma acredito que fique melhor o uso...

Summary by Sourcery

Allow filtering messages by either remoteJid or senderPn by adding dynamic OR conditions to Prisma message queries

Enhancements:

  • Include senderPn in message key filters
  • Combine remoteJid and senderPn with OR logic in prismaRepository.message.count and findMany queries

Copy link
Contributor

sourcery-ai bot commented Jul 30, 2025

Reviewer's Guide

Refactors WhatsApp message filtering in Prisma queries to dynamically combine remoteJid and senderPn conditions using an OR operator while retaining existing AND filters.

Class diagram for updated message filter parameters

classDiagram
    class KeyFilters {
        id: string
        fromMe: boolean
        remoteJid: string
        senderPn: string
        participants: string
    }
Loading

Flow diagram for dynamic OR filtering in message queries

flowchart TD
    A[Receive keyFilters input] --> B{Build Prisma where clause}
    B --> C[Add AND filters: id, fromMe, participants]
    B --> D[Add OR filters: remoteJid, senderPn]
    C --> E[Execute count or findMany query]
    D --> E
Loading

File-Level Changes

Change Details Files
Extend message key filters schema
  • Add optional senderPn property to keyFilters interface
src/api/integrations/channel/whatsapp/whatsapp.baileys.service.ts
Introduce dynamic OR filter for remoteJid and senderPn
  • Remove standalone remoteJid condition from AND clause
  • Insert OR block combining remoteJid and senderPn checks
  • Apply updated where structure in both count and findMany queries
src/api/integrations/channel/whatsapp/whatsapp.baileys.service.ts

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

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 @anderecc - I've reviewed your changes - here's some feedback:

  • The OR filter should be nested inside the AND array (e.g. AND: […, { OR: […] }]) to preserve the intended A AND (B OR C) logic rather than placing OR at the top level.
  • Build the OR array dynamically by only adding objects when keyFilters.remoteJid/senderPn is defined, so you don’t include empty filter objects that could match everything unexpectedly.
Prompt for AI Agents
Please address the comments from this code review:
## Overall Comments
- The OR filter should be nested inside the AND array (e.g. AND: […, { OR: [] }]) to preserve the intended A AND (B OR C) logic rather than placing OR at the top level.
- Build the OR array dynamically by only adding objects when keyFilters.remoteJid/senderPn is defined, so you don’t include empty filter objects that could match everything unexpectedly.

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.

@DavidsonGomes DavidsonGomes changed the base branch from main to develop August 4, 2025 21:45
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.

1 participant