Skip to content

Conversation

@SauravBizbRolly
Copy link
Contributor

@SauravBizbRolly SauravBizbRolly commented Jul 7, 2025

📋 Description

JIRA ID:

Please provide a summary of the change and the motivation behind it. Include relevant context and details.


✅ 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)

ℹ️ Additional Information

Please describe how the changes were tested, and include any relevant screenshots, logs, or other information that provides additional context.

Summary by CodeRabbit

  • New Features

    • Introduced beneficiary consent OTP endpoints for sending, validating, and resending consent OTPs.
    • Added dynamic form management with endpoints for creating modules and form types.
    • Enabled Firebase Cloud Messaging integration and notification endpoints, including device token management.
    • Added support for storing and managing user device tokens for notifications.
  • Enhancements

    • Added new configuration options for Firebase integration and expanded application properties for external services and schedulers.
    • Improved beneficiary consent tracking with new fields in identity and beneficiary models.
  • Bug Fixes

    • Improved error handling and logging in identity and OTP services.
  • Refactor

    • Refactored JWT utility methods and removed denylist dependency.
  • Chores

    • Added new data models, DTOs, repositories, and service classes to support new features.

@coderabbitai
Copy link
Contributor

coderabbitai bot commented Jul 7, 2025

Caution

Review failed

The pull request is closed.

Walkthrough

This update introduces Firebase Cloud Messaging integration, beneficiary consent OTP handling, and a dynamic form system. It adds new REST controllers, services, repositories, DTOs, and entity classes, along with corresponding configuration properties and dependencies. Additional changes include JWT utility refactoring, consent field additions, and enhanced logging and error handling.

Changes

Files/Groups Change Summary
pom.xml Added Firebase Admin SDK dependency.
src/main/environment/common_ci.properties, src/main/environment/common_docker.properties Appended Firebase integration properties.
src/main/resources/application.properties Added extensive configuration properties for external integrations and schedulers.
src/main/java/com/iemr/common/CommonApplication.java Added Firebase-related imports in preparation for integration.
src/main/java/com/iemr/common/config/firebase/FirebaseMessagingConfig.java New Spring config for Firebase Messaging; initializes FirebaseMessaging bean using properties and credentials file.
src/main/java/com/iemr/common/controller/beneficiaryConsent/BeneficiaryConsentController.java New REST controller for beneficiary consent OTP: send, validate, and resend endpoints.
src/main/java/com/iemr/common/controller/dynamicForm/DynamicFormController.java New REST controller for dynamic form module and form type creation.
src/main/java/com/iemr/common/controller/firebaseNotification/FirebaseNotificationController.java New REST controller for sending Firebase notifications and managing user tokens.
src/main/java/com/iemr/common/controller/otp/OTPGateway.java Enhanced logging and modified OTP response checks.
src/main/java/com/iemr/common/controller/users/IEMRAdminController.java Updated JWT user ID extraction method.
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, .../ModuleEntity.java New JPA entities for dynamic forms and modules.
src/main/java/com/iemr/common/data/userToken/UserTokenData.java New JPA entity for storing user Firebase tokens.
src/main/java/com/iemr/common/dto/dynamicForm/FormFieldDTO.java, .../FormTypeEntityDTO.java, .../ModuleEntityDTO.java New DTOs for dynamic form fields, types, and modules.
src/main/java/com/iemr/common/dto/identity/CommonIdentityDTO.java, .../model/beneficiary/BeneficiaryModel.java Added isConsent Boolean field to DTO and model.
src/main/java/com/iemr/common/model/notification/NotificationMessage.java, .../UserToken.java New model classes for notification messages and user tokens.
src/main/java/com/iemr/common/repo/userToken/UserTokenRepo.java New JPA repository for user tokens.
src/main/java/com/iemr/common/repository/dynamic_form/FormTypeRepository.java, .../ModuleRepository.java New Spring Data repositories for dynamic forms and modules.
src/main/java/com/iemr/common/service/beneficiary/IdentityBeneficiaryServiceImpl.java Switched to Spring property injection, added logging, and improved error handling.
src/main/java/com/iemr/common/service/beneficiary/RegisterBenificiaryServiceImpl.java Set isConsent field on identity DTO, minor logging changes.
src/main/java/com/iemr/common/service/beneficiaryOTPHandler/BeneficiaryOTPHandler.java, .../Impl.java New interface and implementation for OTP handling (send, validate, resend) for beneficiary consent.
src/main/java/com/iemr/common/service/dynamicForm/FormTypeService.java, .../ModuleService.java New services for managing dynamic forms and modules.
src/main/java/com/iemr/common/service/firebaseNotification/FirebaseNotificationService.java New service for sending Firebase notifications and managing tokens.
src/main/java/com/iemr/common/service/notification/NotificationService.java Added blank line (no logic change).
src/main/java/com/iemr/common/utils/JwtUserIdValidationFilter.java Added blank line (no logic change).
src/main/java/com/iemr/common/utils/JwtUtil.java Refactored: removed token denylist check, simplified validation, changed user ID extraction logic.

Sequence Diagram(s)

sequenceDiagram
    participant Client
    participant BeneficiaryConsentController
    participant BeneficiaryOTPHandlerImpl
    participant SMS Gateway

    Client->>BeneficiaryConsentController: POST /beneficiaryConsent/sendConsent (mobNo)
    BeneficiaryConsentController->>BeneficiaryOTPHandlerImpl: sendOTP(request)
    BeneficiaryOTPHandlerImpl->>BeneficiaryOTPHandlerImpl: Generate OTP & encrypt
    BeneficiaryOTPHandlerImpl->>SMS Gateway: Send OTP SMS
    SMS Gateway-->>BeneficiaryOTPHandlerImpl: SMS Response
    BeneficiaryOTPHandlerImpl-->>BeneficiaryConsentController: OTP send result
    BeneficiaryConsentController-->>Client: OutputResponse

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

    Client->>FirebaseNotificationController: POST /firebaseNotification/sendNotification (NotificationMessage)
    FirebaseNotificationController->>FirebaseNotificationService: sendNotification(notification)
    FirebaseNotificationService->>FirebaseMessaging: send(message)
    FirebaseMessaging-->>FirebaseNotificationService: Send result
    FirebaseNotificationService-->>FirebaseNotificationController: Response
    FirebaseNotificationController-->>Client: Response
Loading
sequenceDiagram
    participant Client
    participant DynamicFormController
    participant ModuleService
    participant FormTypeService
    participant ModuleRepository
    participant FormTypeRepository

    Client->>DynamicFormController: POST /masterFrom/modules (ModuleEntityDTO)
    DynamicFormController->>ModuleService: save(moduleDTO)
    ModuleService->>ModuleRepository: save(entity)
    ModuleRepository-->>ModuleService: ModuleEntity
    ModuleService-->>DynamicFormController: ModuleEntity
    DynamicFormController-->>Client: ModuleEntity

    Client->>DynamicFormController: POST /masterFrom/modules/{moduleId}/form-types (FormTypeEntityDTO)
    DynamicFormController->>FormTypeService: createFormType(moduleId, formTypeDTO)
    FormTypeService->>ModuleRepository: findById(moduleId)
    ModuleRepository-->>FormTypeService: ModuleEntity
    FormTypeService->>FormTypeRepository: save(FormEntity)
    FormTypeRepository-->>FormTypeService: FormEntity
    FormTypeService-->>DynamicFormController: FormEntity
    DynamicFormController-->>Client: FormEntity
Loading

Possibly related PRs

  • Fix firebasebase64 #234: Adds Firebase Admin SDK, configuration, and initialization—directly related Firebase integration setup.
  • Fix identity api url #246: Adds Firebase dependencies, configuration, messaging setup, and notification controller—strong code-level overlap.
  • Beneficiary consent #170: Introduces the isConsent field in DTOs and model, matching additions in this PR.

Suggested labels

enhancement

Suggested reviewers

  • ravishanigarapu
  • drtechie

Poem

In fields of code, a rabbit hops,
With Firebase clouds and OTP drops.
Dynamic forms begin to bloom,
Consent and tokens find their room.
New services spring from fertile ground,
Notifications leap and bound—
In this patch, new features abound! 🐇✨


📜 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 46195c5 and af2abc7.

📒 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 (4 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 (1 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 7, 2025 06:11
@SauravBizbRolly SauravBizbRolly merged commit 320605a into PSMRI:3.3.0 Jul 7, 2025
4 checks passed
@sonarqubecloud
Copy link

sonarqubecloud bot commented Jul 7, 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 Sep 2, 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