Skip to content
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

Feature/dev tomaster #36

Merged
merged 62 commits into from
Oct 13, 2023
Merged

Feature/dev tomaster #36

merged 62 commits into from
Oct 13, 2023

Conversation

ravishanigarapu
Copy link
Member

Description

Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change.

Type of change

  • Bug fix
  • New feature
  • Enhancement
  • Refactoring
  • Documentation
  • Other ( please specify )

How Has This Been Tested?

Please describe the tests that you ran to verify your changes. Please also note any relevant details for your test configuration.

  • Test A
  • Test B

Checklist:

  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • My changes generate no new warnings
  • Any dependent changes have been merged and published in downstream modules

mahimaeg and others added 30 commits June 5, 2023 12:01
* Create README.md

Added new readme.md file

* Update README.md
* Removed unnecessary dependencies from pom.xml, added crypto.utils to resolve build issues

* pom.xml cleanup
* Create CONTRIBUTING.md

* Create CODE_OF_CONDUCT.md

* Create COPYING

* Update README.md
* modified .gitignore file

* Delete target directory

* Update .gitignore

* Delete logs directory
Co-authored-by: Anjana K J <[email protected]>
* code smell fix

* code smell fixes

* Sonarqube reported code smell fix

* done correction for application.properties
* Swagger changes

* Swagger changes
* Create sast-and-package-prod.yml

* Update sast-and-package-prod.yml
Added environment variable
* Added environment variable

* Added password changes
* Passing environment variable

* Passing environment variable
* Update sast-and-package-prod.yml

* Update sast-and-package.yml
* CreatedDate filed for Identity

* removed uncommented code
* CreatedDate filed for Identity

* removed uncommented code

* deleting DB config

* Send SMS Null ID Issue
sunil-beehyv and others added 24 commits August 8, 2023 11:37
Updated Workflows which triggers on Pull Request and push events for develop branch
Implementing Basic reverse sync operation
Search Patients API - FHIR resource
@swetatech24 swetatech24 self-requested a review October 13, 2023 08:04
Copy link
Contributor

@swetatech24 swetatech24 left a comment

Choose a reason for hiding this comment

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

LGTM

@swetatech24 swetatech24 merged commit fc53d1f into master Oct 13, 2023
1 check passed
@ravishanigarapu ravishanigarapu deleted the feature/devTomaster branch October 13, 2023 09:30
harimohanr added a commit that referenced this pull request Dec 14, 2023
* Develop branch merge to master (#5)

* Readme file added (#1)

* Create README.md

Added new readme.md file

* Update README.md

* Removed unnecessary dependencies from pom.xml (#2)

* Removed unnecessary dependencies from pom.xml, added crypto.utils to resolve build issues

* pom.xml cleanup

* updated code-of-conduct, copying, contributing, readme (#3)

* Create CONTRIBUTING.md

* Create CODE_OF_CONDUCT.md

* Create COPYING

* Update README.md

* modified .gitignore file (#4)

* modified .gitignore file

* Delete target directory

* Update .gitignore

* Delete logs directory

---------

Co-authored-by: Mahima Elizabeth George <[email protected]>
Co-authored-by: Sweta Prakash <[email protected]>
Co-authored-by: Vidyadevi Salunkhe <[email protected]>

* Feature/dev tomaster (#36)

* Readme file added (#1)

* Create README.md

Added new readme.md file

* Update README.md

* Removed unnecessary dependencies from pom.xml (#2)

* Removed unnecessary dependencies from pom.xml, added crypto.utils to resolve build issues

* pom.xml cleanup

* updated code-of-conduct, copying, contributing, readme (#3)

* Create CONTRIBUTING.md

* Create CODE_OF_CONDUCT.md

* Create COPYING

* Update README.md

* modified .gitignore file (#4)

* modified .gitignore file

* Delete target directory

* Update .gitignore

* Delete logs directory

* code smell fixes (#6)

* Added copyright text (#7)

Co-authored-by: Anjana K J <[email protected]>

* code smell fix (#8)

* code smell fix

* code smell fixes

* Sonarqube reported code smell fix

* done correction for application.properties

* Swagger changes (#9)

* Swagger changes

* Swagger changes

* Code smell fix (#10)

* code smell fixes (#11)

* Create sast-and-package-prod.yml (#12)

* Create sast-and-package-prod.yml

* Update sast-and-package-prod.yml

* Code smell changes (#13)

* Update README.md

* code smell fixes

* Added environment variable

* Added password changes & edit environment variable (#16)

* Added environment variable

* Added password changes

* Passing environment variable

* Passing environment variable (#17)

* Passing environment variable

* Passing environment variable (#19)

* Passing environment variable (#20)

* Passing environment variable

* Passing environment variable

* Workflow change (#21)

* Update sast-and-package-prod.yml

* Update sast-and-package.yml

* CreatedDate filed for Identity (#22)

* CreatedDate filed for Identity

* removed uncommented code

* Send SMS null Id issue (#23)

* CreatedDate filed for Identity

* removed uncommented code

* deleting DB config

* Send SMS Null ID Issue

* mmu cr changes

* update changes

* changes mmu cr

* Update sast-and-package-prod.yml (#26)

* edit api changes

* Identity API cleanup and password masking

* Updated the language option for codeql and added maven test

* Added CodeQl tool to do static code analysis on pull request

* Implementing Basic reverse sync operation

* Fix issue on controller

* Updated the language option for codeql and added maven test

* Added CodeQl tool to do static code analysis on pull request

* Implementing Basic reverse sync operation

* Fix issue on controller

* Identity API cleanup and password masking

* edit api changes

* change made in description of identity controller (#30)

* Multiple beneficiaries sync issue changes for FLW (#31)

Co-authored-by: Devika <[email protected]>

* Delete .github/workflows/sast-and-package-prod.yml

* Delete .github/workflows/sast-and-package.yml

* Create package-prod.yml

* Create package.yml

* Create sast.yml

* Use a logger to log this exception (#32)

* Added Pull Request template, added placeholders in properties file, and added admin_local to git ignore (#33)

---------

Co-authored-by: Mahima Elizabeth George <[email protected]>
Co-authored-by: Sweta Prakash <[email protected]>
Co-authored-by: Vidyadevi Salunkhe <[email protected]>
Co-authored-by: Anjana2310 <[email protected]>
Co-authored-by: Anjana K J <[email protected]>
Co-authored-by: Harimohan Rajamohanan <[email protected]>
Co-authored-by: swetatech24 <[email protected]>
Co-authored-by: Anjana <[email protected]>
Co-authored-by: mukul5947 <[email protected]>
Co-authored-by: Indrani Bandyopadhyay <[email protected]>
Co-authored-by: devikasuresh20 <[email protected]>
Co-authored-by: indraniBan <[email protected]>
Co-authored-by: Sunil GV <[email protected]>
Co-authored-by: roopesh-beehyv <[email protected]>
Co-authored-by: helenKaryamsetty <[email protected]>
Co-authored-by: Babacar Ndiaye <[email protected]>
Co-authored-by: Devika <[email protected]>

* Resolved a merge conflict

---------

Co-authored-by: Mahima Elizabeth George <[email protected]>
Co-authored-by: Sweta Prakash <[email protected]>
Co-authored-by: Vidyadevi Salunkhe <[email protected]>
Co-authored-by: ravishanigarapu <[email protected]>
Co-authored-by: Anjana2310 <[email protected]>
Co-authored-by: Anjana K J <[email protected]>
Co-authored-by: swetatech24 <[email protected]>
Co-authored-by: Anjana <[email protected]>
Co-authored-by: mukul5947 <[email protected]>
Co-authored-by: Indrani Bandyopadhyay <[email protected]>
Co-authored-by: devikasuresh20 <[email protected]>
Co-authored-by: indraniBan <[email protected]>
Co-authored-by: Sunil GV <[email protected]>
Co-authored-by: roopesh-beehyv <[email protected]>
Co-authored-by: helenKaryamsetty <[email protected]>
Co-authored-by: Babacar Ndiaye <[email protected]>
Co-authored-by: Devika <[email protected]>
ravishanigarapu added a commit that referenced this pull request Dec 14, 2023
* Readme file added (#1)

* Create README.md

Added new readme.md file

* Update README.md

* Removed unnecessary dependencies from pom.xml (#2)

* Removed unnecessary dependencies from pom.xml, added crypto.utils to resolve build issues

* pom.xml cleanup

* updated code-of-conduct, copying, contributing, readme (#3)

* Create CONTRIBUTING.md

* Create CODE_OF_CONDUCT.md

* Create COPYING

* Update README.md

* modified .gitignore file (#4)

* modified .gitignore file

* Delete target directory

* Update .gitignore

* Delete logs directory

* code smell fixes (#6)

* Added copyright text (#7)

Co-authored-by: Anjana K J <[email protected]>

* code smell fix (#8)

* code smell fix

* code smell fixes

* Sonarqube reported code smell fix

* done correction for application.properties

* Swagger changes (#9)

* Swagger changes

* Swagger changes

* Code smell fix (#10)

* code smell fixes (#11)

* Create sast-and-package-prod.yml (#12)

* Create sast-and-package-prod.yml

* Update sast-and-package-prod.yml

* Code smell changes (#13)

* Update README.md

* code smell fixes

* Added environment variable

* Added password changes & edit environment variable (#16)

* Added environment variable

* Added password changes

* Passing environment variable

* Passing environment variable (#17)

* Passing environment variable

* Passing environment variable (#19)

* Passing environment variable (#20)

* Passing environment variable

* Passing environment variable

* Workflow change (#21)

* Update sast-and-package-prod.yml

* Update sast-and-package.yml

* CreatedDate filed for Identity (#22)

* CreatedDate filed for Identity

* removed uncommented code

* Send SMS null Id issue (#23)

* CreatedDate filed for Identity

* removed uncommented code

* deleting DB config

* Send SMS Null ID Issue

* mmu cr changes

* update changes

* changes mmu cr

* Update sast-and-package-prod.yml (#26)

* edit api changes

* Identity API cleanup and password masking

* Updated the language option for codeql and added maven test

* Added CodeQl tool to do static code analysis on pull request

* Implementing Basic reverse sync operation

* Fix issue on controller

* Updated the language option for codeql and added maven test

* Added CodeQl tool to do static code analysis on pull request

* Implementing Basic reverse sync operation

* Fix issue on controller

* Identity API cleanup and password masking

* edit api changes

* change made in description of identity controller (#30)

* Multiple beneficiaries sync issue changes for FLW (#31)

Co-authored-by: Devika <[email protected]>

* Delete .github/workflows/sast-and-package-prod.yml

* Delete .github/workflows/sast-and-package.yml

* Create package-prod.yml

* Create package.yml

* Create sast.yml

* Use a logger to log this exception (#32)

* Added Pull Request template, added placeholders in properties file, and added admin_local to git ignore (#33)

* Add CI build properties, add pom.xml plugins to tweak build process (#34)

* Add CI build properties, add pom.xml plugins to tweak build process

* Correct .gitignore file names

* http insecure changes (#39)

Co-authored-by: Burdhi. Shivani <[email protected]>

* Merge branch 'master'  (#40)

* Merge branch 'master' of
https://github.com/helenKaryamsetty/Identity-API

* Delete src/main/java/com/iemr/common/identity/utils/CryptoUtil.java

---------

Co-authored-by: KA40094929 <[email protected]>
Co-authored-by: ravishanigarapu <[email protected]>

* Merge conflict resolution prior to develop -> master merge (#42)

* Develop branch merge to master (#5)

* Readme file added (#1)

* Create README.md

Added new readme.md file

* Update README.md

* Removed unnecessary dependencies from pom.xml (#2)

* Removed unnecessary dependencies from pom.xml, added crypto.utils to resolve build issues

* pom.xml cleanup

* updated code-of-conduct, copying, contributing, readme (#3)

* Create CONTRIBUTING.md

* Create CODE_OF_CONDUCT.md

* Create COPYING

* Update README.md

* modified .gitignore file (#4)

* modified .gitignore file

* Delete target directory

* Update .gitignore

* Delete logs directory

---------

Co-authored-by: Mahima Elizabeth George <[email protected]>
Co-authored-by: Sweta Prakash <[email protected]>
Co-authored-by: Vidyadevi Salunkhe <[email protected]>

* Feature/dev tomaster (#36)

* Readme file added (#1)

* Create README.md

Added new readme.md file

* Update README.md

* Removed unnecessary dependencies from pom.xml (#2)

* Removed unnecessary dependencies from pom.xml, added crypto.utils to resolve build issues

* pom.xml cleanup

* updated code-of-conduct, copying, contributing, readme (#3)

* Create CONTRIBUTING.md

* Create CODE_OF_CONDUCT.md

* Create COPYING

* Update README.md

* modified .gitignore file (#4)

* modified .gitignore file

* Delete target directory

* Update .gitignore

* Delete logs directory

* code smell fixes (#6)

* Added copyright text (#7)

Co-authored-by: Anjana K J <[email protected]>

* code smell fix (#8)

* code smell fix

* code smell fixes

* Sonarqube reported code smell fix

* done correction for application.properties

* Swagger changes (#9)

* Swagger changes

* Swagger changes

* Code smell fix (#10)

* code smell fixes (#11)

* Create sast-and-package-prod.yml (#12)

* Create sast-and-package-prod.yml

* Update sast-and-package-prod.yml

* Code smell changes (#13)

* Update README.md

* code smell fixes

* Added environment variable

* Added password changes & edit environment variable (#16)

* Added environment variable

* Added password changes

* Passing environment variable

* Passing environment variable (#17)

* Passing environment variable

* Passing environment variable (#19)

* Passing environment variable (#20)

* Passing environment variable

* Passing environment variable

* Workflow change (#21)

* Update sast-and-package-prod.yml

* Update sast-and-package.yml

* CreatedDate filed for Identity (#22)

* CreatedDate filed for Identity

* removed uncommented code

* Send SMS null Id issue (#23)

* CreatedDate filed for Identity

* removed uncommented code

* deleting DB config

* Send SMS Null ID Issue

* mmu cr changes

* update changes

* changes mmu cr

* Update sast-and-package-prod.yml (#26)

* edit api changes

* Identity API cleanup and password masking

* Updated the language option for codeql and added maven test

* Added CodeQl tool to do static code analysis on pull request

* Implementing Basic reverse sync operation

* Fix issue on controller

* Updated the language option for codeql and added maven test

* Added CodeQl tool to do static code analysis on pull request

* Implementing Basic reverse sync operation

* Fix issue on controller

* Identity API cleanup and password masking

* edit api changes

* change made in description of identity controller (#30)

* Multiple beneficiaries sync issue changes for FLW (#31)

Co-authored-by: Devika <[email protected]>

* Delete .github/workflows/sast-and-package-prod.yml

* Delete .github/workflows/sast-and-package.yml

* Create package-prod.yml

* Create package.yml

* Create sast.yml

* Use a logger to log this exception (#32)

* Added Pull Request template, added placeholders in properties file, and added admin_local to git ignore (#33)

---------

Co-authored-by: Mahima Elizabeth George <[email protected]>
Co-authored-by: Sweta Prakash <[email protected]>
Co-authored-by: Vidyadevi Salunkhe <[email protected]>
Co-authored-by: Anjana2310 <[email protected]>
Co-authored-by: Anjana K J <[email protected]>
Co-authored-by: Harimohan Rajamohanan <[email protected]>
Co-authored-by: swetatech24 <[email protected]>
Co-authored-by: Anjana <[email protected]>
Co-authored-by: mukul5947 <[email protected]>
Co-authored-by: Indrani Bandyopadhyay <[email protected]>
Co-authored-by: devikasuresh20 <[email protected]>
Co-authored-by: indraniBan <[email protected]>
Co-authored-by: Sunil GV <[email protected]>
Co-authored-by: roopesh-beehyv <[email protected]>
Co-authored-by: helenKaryamsetty <[email protected]>
Co-authored-by: Babacar Ndiaye <[email protected]>
Co-authored-by: Devika <[email protected]>

* Resolved a merge conflict

---------

Co-authored-by: Mahima Elizabeth George <[email protected]>
Co-authored-by: Sweta Prakash <[email protected]>
Co-authored-by: Vidyadevi Salunkhe <[email protected]>
Co-authored-by: ravishanigarapu <[email protected]>
Co-authored-by: Anjana2310 <[email protected]>
Co-authored-by: Anjana K J <[email protected]>
Co-authored-by: swetatech24 <[email protected]>
Co-authored-by: Anjana <[email protected]>
Co-authored-by: mukul5947 <[email protected]>
Co-authored-by: Indrani Bandyopadhyay <[email protected]>
Co-authored-by: devikasuresh20 <[email protected]>
Co-authored-by: indraniBan <[email protected]>
Co-authored-by: Sunil GV <[email protected]>
Co-authored-by: roopesh-beehyv <[email protected]>
Co-authored-by: helenKaryamsetty <[email protected]>
Co-authored-by: Babacar Ndiaye <[email protected]>
Co-authored-by: Devika <[email protected]>

---------

Co-authored-by: Mahima Elizabeth George <[email protected]>
Co-authored-by: Sweta Prakash <[email protected]>
Co-authored-by: Vidyadevi Salunkhe <[email protected]>
Co-authored-by: Anjana2310 <[email protected]>
Co-authored-by: Anjana K J <[email protected]>
Co-authored-by: Harimohan Rajamohanan <[email protected]>
Co-authored-by: swetatech24 <[email protected]>
Co-authored-by: Anjana <[email protected]>
Co-authored-by: ravishanigarapu <[email protected]>
Co-authored-by: mukul5947 <[email protected]>
Co-authored-by: Indrani Bandyopadhyay <[email protected]>
Co-authored-by: Ravi Shanigarapu <[email protected]>
Co-authored-by: devikasuresh20 <[email protected]>
Co-authored-by: indraniBan <[email protected]>
Co-authored-by: Sunil GV <[email protected]>
Co-authored-by: roopesh-beehyv <[email protected]>
Co-authored-by: Babacar Ndiaye <[email protected]>
Co-authored-by: Devika <[email protected]>
Co-authored-by: Mithun James <[email protected]>
Co-authored-by: bshivani7 <[email protected]>
Co-authored-by: Burdhi. Shivani <[email protected]>
Co-authored-by: KA40094929 <[email protected]>
Co-authored-by: Harimohan Rajamohanan <[email protected]>
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.