Skip to content

Conversation

SauravBizbRolly
Copy link

@SauravBizbRolly SauravBizbRolly commented Jul 4, 2025

📋 Description

revert changes


✅ Type of Change

  • 🐞 Bug fix (non-breaking change which resolves an issue)
  • New feature (non-breaking change which adds functionality)
  • 🔥 Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • 🛠 Refactor (change that is neither a fix nor a new feature)
  • ⚙️ Config change (configuration file or build script updates)
  • 📚 Documentation (updates to docs or readme)
  • 🧪 Tests (adding new or updating existing tests)
  • 🎨 UI/UX (changes that affect the user interface)
  • 🚀 Performance (improves performance)
  • 🧹 Chore (miscellaneous changes that don't modify src or test files)

Summary by CodeRabbit

  • New Features

    • Introduced beneficiary consent management with OTP-based consent endpoints.
    • Added dynamic form management, enabling creation of modules and form types.
    • Integrated Firebase Cloud Messaging for sending notifications and managing user tokens.
    • Added new REST controllers for beneficiary consent, dynamic forms, and Firebase notifications.
  • Enhancements

    • Added new fields for consent tracking in beneficiary and identity data models.
    • Expanded application configuration with Firebase, database, scheduler, and external service integration settings.
  • Bug Fixes

    • Improved error handling and logging in beneficiary identity response service.
    • Updated JWT utility logic for token validation and user ID extraction.
  • Chores

    • Added new Maven dependency for Firebase Admin SDK.
    • Introduced new data models, DTOs, repositories, and service interfaces for OTP, forms, and notifications.
    • Updated environment and Docker properties for Firebase integration.

Copy link
Contributor

coderabbitai bot commented Jul 4, 2025

Caution

Review failed

The pull request is closed.

Walkthrough

This change introduces Firebase integration, OTP handling for beneficiary consent, and a dynamic form module. It adds new dependencies, configuration properties, controller classes, DTOs, entities, repositories, and services for Firebase notifications, OTP verification, and dynamic forms. Minor refactoring and field additions are made to existing classes.

Changes

File(s) Change Summary
pom.xml Added Firebase Admin SDK dependency.
src/main/environment/common_ci.properties
src/main/environment/common_docker.properties
src/main/resources/application.properties
Added Firebase and other configuration properties for environment and services.
src/main/java/com/iemr/common/CommonApplication.java Added Firebase-related import statements.
src/main/java/com/iemr/common/config/firebase/FirebaseMessagingConfig.java New configuration class for FirebaseMessaging bean initialization.
src/main/java/com/iemr/common/controller/beneficiaryConsent/BeneficiaryConsentController.java New controller for beneficiary consent OTP send, validate, and resend endpoints.
src/main/java/com/iemr/common/controller/dynamicForm/DynamicFormController.java New controller for dynamic form module and form type creation.
src/main/java/com/iemr/common/controller/firebaseNotification/FirebaseNotificationController.java New controller for sending Firebase notifications and managing user tokens.
src/main/java/com/iemr/common/controller/otp/OTPGateway.java Added logging and modified OTP response checks.
src/main/java/com/iemr/common/controller/users/IEMRAdminController.java Changed JWT user ID extraction method call.
src/main/java/com/iemr/common/data/beneficiaryConsent/BeneficiaryConsentRequest.java New DTO for beneficiary consent OTP requests.
src/main/java/com/iemr/common/data/dynamic_from/FormEntity.java
src/main/java/com/iemr/common/data/dynamic_from/ModuleEntity.java
New JPA entities for dynamic forms and modules.
src/main/java/com/iemr/common/data/userToken/UserTokenData.java New entity for storing user tokens.
src/main/java/com/iemr/common/dto/dynamicForm/FormFieldDTO.java
src/main/java/com/iemr/common/dto/dynamicForm/FormTypeEntityDTO.java
src/main/java/com/iemr/common/dto/dynamicForm/ModuleEntityDTO.java
New DTOs for dynamic form fields, types, and modules.
src/main/java/com/iemr/common/dto/identity/CommonIdentityDTO.java Added isConsent field.
src/main/java/com/iemr/common/model/beneficiary/BeneficiaryModel.java Added isConsent field with @Expose.
src/main/java/com/iemr/common/model/notification/NotificationMessage.java
src/main/java/com/iemr/common/model/notification/UserToken.java
New models for notification message and user tokens.
src/main/java/com/iemr/common/repo/userToken/UserTokenRepo.java New repository for user tokens.
src/main/java/com/iemr/common/repository/dynamic_form/FormTypeRepository.java
src/main/java/com/iemr/common/repository/dynamic_form/ModuleRepository.java
New repositories for dynamic form entities.
src/main/java/com/iemr/common/service/beneficiary/IdentityBeneficiaryServiceImpl.java Improved error handling and logging in identity response.
src/main/java/com/iemr/common/service/beneficiary/RegisterBenificiaryServiceImpl.java Logging and redundant isConsent assignment.
src/main/java/com/iemr/common/service/beneficiaryOTPHandler/BeneficiaryOTPHandler.java
src/main/java/com/iemr/common/service/beneficiaryOTPHandler/BeneficiaryOTPHandlerImpl.java
New interface and implementation for OTP handling.
src/main/java/com/iemr/common/service/dynamicForm/FormTypeService.java
src/main/java/com/iemr/common/service/dynamicForm/ModuleService.java
New services for dynamic form and module management.
src/main/java/com/iemr/common/service/firebaseNotification/FirebaseNotificationService.java New service for Firebase notification send, token update, and retrieval.
src/main/java/com/iemr/common/service/notification/NotificationService.java Added blank line after method declaration.
src/main/java/com/iemr/common/utils/JwtUserIdValidationFilter.java Added blank line after logging.
src/main/java/com/iemr/common/utils/JwtUtil.java Refactored to remove denylist, simplified validation, and changed user ID extraction.

Sequence Diagram(s)

sequenceDiagram
    participant Client
    participant BeneficiaryConsentController
    participant BeneficiaryOTPHandlerImpl
    participant SMSGateway
    participant Cache

    Client->>BeneficiaryConsentController: POST /beneficiaryConsent/sendConsent (mobNo)
    BeneficiaryConsentController->>BeneficiaryOTPHandlerImpl: sendOTP(request)
    BeneficiaryOTPHandlerImpl->>Cache: Store encrypted OTP
    BeneficiaryOTPHandlerImpl->>SMSGateway: Send OTP SMS
    SMSGateway-->>BeneficiaryOTPHandlerImpl: SMS Response
    BeneficiaryOTPHandlerImpl-->>BeneficiaryConsentController: Result String
    BeneficiaryConsentController-->>Client: OutputResponse

    Client->>BeneficiaryConsentController: POST /beneficiaryConsent/validateConsent (mobNo, otp)
    BeneficiaryConsentController->>BeneficiaryOTPHandlerImpl: validateOTP(request)
    BeneficiaryOTPHandlerImpl->>Cache: Retrieve encrypted OTP
    BeneficiaryOTPHandlerImpl-->>BeneficiaryConsentController: Validation Result
    BeneficiaryConsentController-->>Client: OutputResponse
Loading
sequenceDiagram
    participant Client
    participant FirebaseNotificationController
    participant FirebaseNotificationService
    participant FirebaseMessaging

    Client->>FirebaseNotificationController: POST /firebaseNotification/sendNotification
    FirebaseNotificationController->>FirebaseNotificationService: sendNotification(notificationMessage)
    FirebaseNotificationService->>FirebaseMessaging: send(message)
    FirebaseMessaging-->>FirebaseNotificationService: Response
    FirebaseNotificationService-->>FirebaseNotificationController: Result String
    FirebaseNotificationController-->>Client: Response
Loading

Possibly related PRs

  • PSMRI/Common-API#227: Implements Firebase Admin SDK, configuration, controllers, OTP handler, and notification services—strong code overlap.
  • PSMRI/Common-API#212: Both PRs modify JwtUtil's token validation logic, one removing and the other adding denylist checks.
  • PSMRI/Common-API#234: Both PRs introduce Firebase Admin SDK, configuration, and FirebaseMessagingConfig with similar initialization logic.

Suggested labels

enhancement

Suggested reviewers

  • ravishanigarapu
  • drtechie

Poem

In fields of code where carrots grow,
A rabbit hops where Firebase flows.
OTPs bounce, dynamic forms bloom,
Notifications flutter, dispelling the gloom.
Beans and configs, new features arise—
With every commit, the project’s surprise!
🥕✨


📜 Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 2f902f8 and f89737a.

📒 Files selected for processing (35)
  • pom.xml (1 hunks)
  • src/main/environment/common_ci.properties (1 hunks)
  • src/main/environment/common_docker.properties (1 hunks)
  • src/main/java/com/iemr/common/CommonApplication.java (3 hunks)
  • src/main/java/com/iemr/common/config/firebase/FirebaseMessagingConfig.java (1 hunks)
  • src/main/java/com/iemr/common/controller/beneficiaryConsent/BeneficiaryConsentController.java (1 hunks)
  • src/main/java/com/iemr/common/controller/dynamicForm/DynamicFormController.java (1 hunks)
  • src/main/java/com/iemr/common/controller/firebaseNotification/FirebaseNotificationController.java (1 hunks)
  • src/main/java/com/iemr/common/controller/otp/OTPGateway.java (2 hunks)
  • src/main/java/com/iemr/common/controller/users/IEMRAdminController.java (1 hunks)
  • src/main/java/com/iemr/common/data/beneficiaryConsent/BeneficiaryConsentRequest.java (1 hunks)
  • src/main/java/com/iemr/common/data/dynamic_from/FormEntity.java (1 hunks)
  • src/main/java/com/iemr/common/data/dynamic_from/ModuleEntity.java (1 hunks)
  • src/main/java/com/iemr/common/data/userToken/UserTokenData.java (1 hunks)
  • src/main/java/com/iemr/common/dto/dynamicForm/FormFieldDTO.java (1 hunks)
  • src/main/java/com/iemr/common/dto/dynamicForm/FormTypeEntityDTO.java (1 hunks)
  • src/main/java/com/iemr/common/dto/dynamicForm/ModuleEntityDTO.java (1 hunks)
  • src/main/java/com/iemr/common/dto/identity/CommonIdentityDTO.java (1 hunks)
  • src/main/java/com/iemr/common/model/beneficiary/BeneficiaryModel.java (2 hunks)
  • src/main/java/com/iemr/common/model/notification/NotificationMessage.java (1 hunks)
  • src/main/java/com/iemr/common/model/notification/UserToken.java (1 hunks)
  • src/main/java/com/iemr/common/repo/userToken/UserTokenRepo.java (1 hunks)
  • src/main/java/com/iemr/common/repository/dynamic_form/FormTypeRepository.java (1 hunks)
  • src/main/java/com/iemr/common/repository/dynamic_form/ModuleRepository.java (1 hunks)
  • src/main/java/com/iemr/common/service/beneficiary/IdentityBeneficiaryServiceImpl.java (2 hunks)
  • src/main/java/com/iemr/common/service/beneficiary/RegisterBenificiaryServiceImpl.java (2 hunks)
  • src/main/java/com/iemr/common/service/beneficiaryOTPHandler/BeneficiaryOTPHandler.java (1 hunks)
  • src/main/java/com/iemr/common/service/beneficiaryOTPHandler/BeneficiaryOTPHandlerImpl.java (1 hunks)
  • src/main/java/com/iemr/common/service/dynamicForm/FormTypeService.java (1 hunks)
  • src/main/java/com/iemr/common/service/dynamicForm/ModuleService.java (1 hunks)
  • src/main/java/com/iemr/common/service/firebaseNotification/FirebaseNotificationService.java (1 hunks)
  • src/main/java/com/iemr/common/service/notification/NotificationService.java (1 hunks)
  • src/main/java/com/iemr/common/utils/JwtUserIdValidationFilter.java (1 hunks)
  • src/main/java/com/iemr/common/utils/JwtUtil.java (1 hunks)
  • src/main/resources/application.properties (2 hunks)
✨ Finishing Touches
  • 📝 Generate Docstrings

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ 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.
    • Explain this complex logic.
    • 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 explain this code block.
    • @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 explain its main purpose.
    • @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.

Support

Need help? Create a ticket on our support page for assistance with any issues or questions.

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 generate docstrings to generate docstrings for this PR.
  • @coderabbitai generate sequence diagram to generate a sequence diagram of the changes in this 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.

CodeRabbit Configuration 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/schema.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.

@SauravBizbRolly SauravBizbRolly changed the base branch from develop to 3.3.0 July 4, 2025 01:43
@SauravBizbRolly SauravBizbRolly merged commit 98759f9 into PSMRI:3.3.0 Jul 4, 2025
4 checks passed
Copy link

sonarqubecloud bot commented Jul 4, 2025

Quality Gate Failed Quality Gate failed

Failed conditions
E Security Rating on New Code (required ≥ A)

See analysis details on SonarQube Cloud

Catch issues before they fail your Quality Gate with our IDE extension SonarQube for IDE

@coderabbitai coderabbitai bot mentioned this pull request Aug 28, 2025
10 tasks
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