Skip to content

Conversation

SauravBizbRolly
Copy link

@SauravBizbRolly SauravBizbRolly commented Jul 4, 2025

πŸ“‹ Description

Fix identity variable

βœ… 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 workflow with OTP-based consent endpoints.
    • Added dynamic form and module management with support for form fields and modular entities.
    • Integrated Firebase Cloud Messaging for notifications, including endpoints to send notifications and manage user tokens.
    • Added new data models and repositories for beneficiary consent, dynamic forms, and user tokens.
  • Enhancements

    • Added configuration options for Firebase integration and dynamic forms.
    • Improved beneficiary identity and OTP handling with enhanced error reporting and logging.
    • Updated JWT utility for simplified token validation and user ID extraction.
    • Added consent tracking to beneficiary and identity data models.
  • Bug Fixes

    • Improved error handling and response validation in beneficiary identity services.
  • Chores

    • Added comprehensive environment and application configuration properties for various features and integrations.

Copy link
Contributor

coderabbitai bot commented Jul 4, 2025

Caution

Review failed

The pull request is closed.

Walkthrough

This update introduces Firebase Cloud Messaging integration, dynamic form management, and beneficiary consent OTP workflows. It adds new REST controllers, DTOs, entities, repositories, and service classes for these features. Configuration files are extended for Firebase and environment-specific settings. JWT utility and beneficiary identity service receive targeted refactoring and error handling improvements.

Changes

File(s) 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 environment-specific configuration properties.
src/main/java/com/iemr/common/CommonApplication.java Added Firebase-related imports.
src/main/java/com/iemr/common/config/firebase/FirebaseMessagingConfig.java New Spring config for FirebaseMessaging bean initialization.
src/main/java/com/iemr/common/controller/beneficiaryConsent/BeneficiaryConsentController.java New controller for beneficiary consent OTP send/validate/resend endpoints.
src/main/java/com/iemr/common/controller/dynamicForm/DynamicFormController.java New controller for dynamic form and module creation endpoints.
src/main/java/com/iemr/common/controller/firebaseNotification/FirebaseNotificationController.java New controller for Firebase notification send/update/get token endpoints.
src/main/java/com/iemr/common/controller/otp/OTPGateway.java Enhanced logging and changed OTP success condition from "success" to containing "otp".
src/main/java/com/iemr/common/controller/users/IEMRAdminController.java Changed 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, 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 JPA entity for storing user Firebase 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 forms and modules.
src/main/java/com/iemr/common/dto/identity/CommonIdentityDTO.java, src/main/java/com/iemr/common/model/beneficiary/BeneficiaryModel.java Added isConsent Boolean field to DTO and model.
src/main/java/com/iemr/common/model/notification/NotificationMessage.java, src/main/java/com/iemr/common/model/notification/UserToken.java New models 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, src/main/java/com/iemr/common/repository/dynamic_form/ModuleRepository.java New repositories for dynamic form and module entities.
src/main/java/com/iemr/common/service/beneficiary/IdentityBeneficiaryServiceImpl.java Refactored identity base URL, improved logging, and enhanced error handling for beneficiary identity responses.
src/main/java/com/iemr/common/service/beneficiary/RegisterBenificiaryServiceImpl.java Added consent field propagation and logging.
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 beneficiary 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 operations.
src/main/java/com/iemr/common/service/firebaseNotification/FirebaseNotificationService.java New service for Firebase notification, token update, and retrieval.
src/main/java/com/iemr/common/service/notification/NotificationService.java Added blank line (no logic changes).
src/main/java/com/iemr/common/utils/JwtUserIdValidationFilter.java Added blank line (no logic changes).
src/main/java/com/iemr/common/utils/JwtUtil.java Refactored token validation, removed denylist, renamed and altered user ID extraction method.

Sequence Diagram(s)

Beneficiary Consent OTP Flow

sequenceDiagram
    participant Client
    participant BeneficiaryConsentController
    participant BeneficiaryOTPHandlerImpl
    participant SMSGateway
    participant Cache

    Client->>BeneficiaryConsentController: POST /beneficiaryConsent/sendConsent (mobNo, userName, designation)
    BeneficiaryConsentController->>BeneficiaryOTPHandlerImpl: sendOTP(request)
    BeneficiaryOTPHandlerImpl->>Cache: Store OTP (encrypted, 5 min expiry)
    BeneficiaryOTPHandlerImpl->>SMSGateway: Send OTP SMS
    BeneficiaryOTPHandlerImpl-->>BeneficiaryConsentController: Success/Failure message
    BeneficiaryConsentController-->>Client: OutputResponse

    Client->>BeneficiaryConsentController: POST /beneficiaryConsent/validateConsent (mobNo, otp, ...)
    BeneficiaryConsentController->>BeneficiaryOTPHandlerImpl: validateOTP(request)
    BeneficiaryOTPHandlerImpl->>Cache: Retrieve OTP
    BeneficiaryOTPHandlerImpl-->>BeneficiaryConsentController: Validation result (success/failure)
    BeneficiaryConsentController-->>Client: OutputResponse
Loading

Firebase Notification Send Flow

sequenceDiagram
    participant Client
    participant FirebaseNotificationController
    participant FirebaseNotificationService
    participant FirebaseMessaging

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

Possibly related PRs

Suggested labels

enhancement

Suggested reviewers

  • ravishanigarapu
  • drtechie
  • vanitha1822

Poem

A rabbit hopped through fields of code,
Bringing Firebase clouds to lighten the load.
OTPs now leap with consent in their stride,
Dynamic forms bloom, no need to hide.
With tokens and beans, new features appearβ€”
This code garden grows, full of cheer!
πŸ‡βœ¨


πŸ“œ 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 61c13a1.

πŸ“’ 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 (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:31
@SauravBizbRolly SauravBizbRolly merged commit 42b8161 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 Jul 4, 2025
10 tasks
@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