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

Version update #85

Merged
merged 4 commits into from
Sep 23, 2021
Merged

Version update #85

merged 4 commits into from
Sep 23, 2021

Conversation

rushang7
Copy link
Contributor

No description provided.

@sathishp-eGov sathishp-eGov merged commit f428ed0 into develop Sep 23, 2021
@sathishp-eGov sathishp-eGov deleted the version-update branch September 23, 2021 11:04
sathishp-eGov pushed a commit that referenced this pull request Sep 23, 2021
* Ifix master data service (#19)

* iFix-Master-Data-Service: Initial Commit

* Update build-config.yml (#3)

* Removed the local RequestHeader, ResponseHeader,Error,ErrorResponse,AuditDetails ,And added the same from common library
Created the basic package structure and concrete classes.
updated the tracer jar version to 2.0.0 snapshot

* Chart of account service - Create v1 Post

* Goverment Create API structuring

* Governmet Create API

* Chart of account service - modified the api end point and put the validation for user info

* Update build-config.yml (#4)

* Env variable added and updated the spring boot version to 2.3.3

* Updated tracer to ifix-tracer.

* Updated groupId for ifix-services-common

* add the @tostring,@EqualsAndHashCode model class level

* Refactored goverment create API and search API

* Recorrection of tracer dependency

* Updated ifix-tracer version

* COA search flow

* Spring boot version change

* Chart of Account - create api - tenant search

* Update Dockerfile

* Refactor responseInfo to responseHeader

* Refactor majorHeadtype to majorHeadType

* Chart of Account - create api - tenant search--> Review comment(s). (#8)

* Rahu eat search api (#7)

* MongoDB pass url instead of host and port

* Removed unused property

* Pk master data coa (#9)

* Chart of Account - create api - tenant search--> Review comment(s).

* Generic type serviceRequestRepository

* Generic type serviceRequestRepository

* Department search Api

* MongoDb url config

Co-authored-by: pintu-eGov <[email protected]>

* Project search API

* Removed unused properties

* Removed corresponding property from the code

* Renamed property

* Project search API (#10)

* file name changes

* Removed unused properties

* MongoDB migration data and instructions. (#13)

* MongoDB migration data and instructions.

* Seed data and index mongo queries

Co-authored-by: pintu-eGov <[email protected]>

* seed data for Coa and government

* IFIX-242: EAT refactored to Expenditure (#16)

* IFIX-242: EAT refactored to Expenditure

* IFIX-242: location value has been removed

* IFIX-242: tenant id in lower case

* changing expenditure class name in seed data

Co-authored-by: Rushang Dhanesha <[email protected]>
Co-authored-by: rushang7-eGov <[email protected]>
Co-authored-by: pintu-eGov <[email protected]>
Co-authored-by: rahu-dev <[email protected]>
Co-authored-by: rahu-eGov <[email protected]>

* Ifix master patch (#20)

* iFix-Master-Data-Service: Initial Commit

* Update build-config.yml (#3)

* Removed the local RequestHeader, ResponseHeader,Error,ErrorResponse,AuditDetails ,And added the same from common library
Created the basic package structure and concrete classes.
updated the tracer jar version to 2.0.0 snapshot

* Chart of account service - Create v1 Post

* Goverment Create API structuring

* Governmet Create API

* Chart of account service - modified the api end point and put the validation for user info

* Update build-config.yml (#4)

* Env variable added and updated the spring boot version to 2.3.3

* Updated tracer to ifix-tracer.

* Updated groupId for ifix-services-common

* add the @tostring,@EqualsAndHashCode model class level

* Refactored goverment create API and search API

* Recorrection of tracer dependency

* Updated ifix-tracer version

* COA search flow

* Spring boot version change

* Chart of Account - create api - tenant search

* Update Dockerfile

* Refactor responseInfo to responseHeader

* Refactor majorHeadtype to majorHeadType

* Chart of Account - create api - tenant search--> Review comment(s). (#8)

* Rahu eat search api (#7)

* MongoDB pass url instead of host and port

* Removed unused property

* Pk master data coa (#9)

* Chart of Account - create api - tenant search--> Review comment(s).

* Generic type serviceRequestRepository

* Generic type serviceRequestRepository

* Department search Api

* MongoDb url config

Co-authored-by: pintu-eGov <[email protected]>

* Project search API

* Removed unused properties

* Removed corresponding property from the code

* Renamed property

* Project search API (#10)

* file name changes

* Removed unused properties

* MongoDB migration data and instructions. (#13)

* MongoDB migration data and instructions.

* Seed data and index mongo queries

Co-authored-by: pintu-eGov <[email protected]>

* seed data for Coa and government

* IFIX-242: EAT refactored to Expenditure (#16)

* IFIX-242: EAT refactored to Expenditure

* IFIX-242: location value has been removed

* IFIX-242: tenant id in lower case

* changing expenditure class name in seed data

* Id addition in COA

* updated the read me

* updated the read me

Co-authored-by: Rushang Dhanesha <[email protected]>
Co-authored-by: rushang7-eGov <[email protected]>
Co-authored-by: pintu-eGov <[email protected]>
Co-authored-by: rahu-dev <[email protected]>
Co-authored-by: rahu-eGov <[email protected]>

* Update CODEOWNERS

* Ifix seed data (#21)

* iFix-Master-Data-Service: Initial Commit

* Update build-config.yml (#3)

* Removed the local RequestHeader, ResponseHeader,Error,ErrorResponse,AuditDetails ,And added the same from common library
Created the basic package structure and concrete classes.
updated the tracer jar version to 2.0.0 snapshot

* Chart of account service - Create v1 Post

* Goverment Create API structuring

* Governmet Create API

* Chart of account service - modified the api end point and put the validation for user info

* Update build-config.yml (#4)

* Env variable added and updated the spring boot version to 2.3.3

* Updated tracer to ifix-tracer.

* Updated groupId for ifix-services-common

* add the @tostring,@EqualsAndHashCode model class level

* Refactored goverment create API and search API

* Recorrection of tracer dependency

* Updated ifix-tracer version

* COA search flow

* Spring boot version change

* Chart of Account - create api - tenant search

* Update Dockerfile

* Refactor responseInfo to responseHeader

* Refactor majorHeadtype to majorHeadType

* Chart of Account - create api - tenant search--> Review comment(s). (#8)

* Rahu eat search api (#7)

* MongoDB pass url instead of host and port

* Removed unused property

* Pk master data coa (#9)

* Chart of Account - create api - tenant search--> Review comment(s).

* Generic type serviceRequestRepository

* Generic type serviceRequestRepository

* Department search Api

* MongoDb url config

Co-authored-by: pintu-eGov <[email protected]>

* Project search API

* Removed unused properties

* Removed corresponding property from the code

* Renamed property

* Project search API (#10)

* file name changes

* Removed unused properties

* MongoDB migration data and instructions. (#13)

* MongoDB migration data and instructions.

* Seed data and index mongo queries

Co-authored-by: pintu-eGov <[email protected]>

* seed data for Coa and government

* IFIX-242: EAT refactored to Expenditure (#16)

* IFIX-242: EAT refactored to Expenditure

* IFIX-242: location value has been removed

* IFIX-242: tenant id in lower case

* changing expenditure class name in seed data

* Id addition in COA

* Tenant Id changes

Co-authored-by: Rushang Dhanesha <[email protected]>
Co-authored-by: rushang7-eGov <[email protected]>
Co-authored-by: pintu-eGov <[email protected]>
Co-authored-by: pintu-eGov <[email protected]>

* ifix services common (#23)

* Created ifix-services-common library

* Update domain name

* Update build-config.yml (#3)

* Update build-config.yml (#4)

* ifix-tracer library

* Update build-config.yml (#5)

* Added dockerfile and Changed settings

* Update dependency repositories

* Updated groupId

* Updated ifix-tracer for Spring 2

* Create .gitignore (#24)

accepting only gitignore

* Fiscal event post processor (#28)

* Update build-config.yml (#3)

* Update build-config.yml (#4)

* Update build-config.yml (#5)

* Updated Dockerfile base image (#6)

* Fiscal Event Post Processor: Initial Commit

* Update build-config.yml (#12)

* IFIX:244 : Service, producer and other packages, classes

* IFIX:244 : Service, producer and other packages, classes

* Rahu ifix 244 (#15)

* Push to MongoDB: config and instruction

* Update README.md

* Pk fiscal event post processor (#17)

* Update README.md

* Refactor consumer name

* Flattening fiscal event data

* Fix: Kafka consumer properties

* Version change

* Addition of ingestionTime and version change

* Added instructions and config for Push to Druid.

* Updated Druid config.

Co-authored-by: rushang7-eGov <[email protected]>
Co-authored-by: Rushang Dhanesha <[email protected]>
Co-authored-by: pintu-eGov <[email protected]>
Co-authored-by: rahu-eGov <[email protected]>
Co-authored-by: rahu-eGov <[email protected]>

* Fiscal event service (#29)

* Update build-config.yml (#3)

* Update build-config.yml (#4)

* Update build-config.yml (#5)

* Updated Dockerfile base image (#6)

* Fiscal Event Service: Initial commit

* Pk fiscal event service (#11)

* IFIX-230 : Added the producer and other package

* IFIX-230 : Basic validator, enricher and other packages structure

Co-authored-by: pintu-eGov <[email protected]>

* IFIX-230 : Moved service package

* Update build-config.yml (#12)

* Rahu ifix 230 (#14)

* IFIX-230 : Validate the COA Ids from master service , Enriched the details

* validate tenant and project Id

* Naming convention resolved

Co-authored-by: pintu-eGov <[email protected]>

* Coa Uri config

* Coa Uri config

* modified the coa -  error message

* EventTypeEnum key value correction

* addition of ingestionTime

* Migration scripts for fiscal event

Co-authored-by: rushang7-eGov <[email protected]>
Co-authored-by: Rushang Dhanesha <[email protected]>
Co-authored-by: pintu-eGov <[email protected]>
Co-authored-by: rahu-eGov <[email protected]>
Co-authored-by: rahu-eGov <[email protected]>

* Ifix zuul (#30)

* Update build-config.yml (#3)

* Update build-config.yml (#4)

* Update build-config.yml (#5)

* ifix-zuul: Copy from DIGIT Zuul

* Code cleanup

* Updated Dockerfile base image (#6)

* Update build-config.yml (#12)

* Jwt Verifier Filter

* Refactored: requestInfo -> requestHeader and responseInfo -> responseHeader

* Commented out all unused filters

* Reformat Code

* Refactor REQUEST_INFO -> REQUEST_HEADER

* Added userInfo to requestHeader by reading it from JWT.

* Bug Fixed

* Commented out unused filter

* Bug fixed

* Removed unused filter

* Resolve test cases

Co-authored-by: rushang7-eGov <[email protected]>
Co-authored-by: Rushang Dhanesha <[email protected]>
Co-authored-by: pintu-eGov <[email protected]>

* Keycloak (#31)

* Update build-config.yml (#3)

* Update build-config.yml (#4)

* Update build-config.yml (#5)

* Updated Dockerfile base image (#6)

* Update build-config.yml (#12)

* Instructions for Creating Client

* Added ifix-realm and instructions to import it

Co-authored-by: rushang7-eGov <[email protected]>
Co-authored-by: Rushang Dhanesha <[email protected]>
Co-authored-by: pintu-eGov <[email protected]>

* Build config for department entity service (#34)

* Convert enum to all caps (#36)

Co-authored-by: rushang7-eGov <[email protected]>

* Rahu 310 (#38)

* Supporting code for Project Department Entity Ancestry Integration

* Project create API

* Enrich department entity ancestry in project.

* Added departmentId in DepartmentEntity model

* Department entity validation

* COA code fix

Co-authored-by: rushang7-eGov <[email protected]>

* Refactored: responseInfo -> responseHeader (#39)

* Pk department entity post processor (#40)

* Updated Druid ingestion config (#41)

Co-authored-by: rushang7-eGov <[email protected]>

* IFIX-320: EAT index refactor (#44)

* Ifix department entity service (#45)

* Update build-config.yml (#3)

* Update build-config.yml (#4)

* Update build-config.yml (#5)

* Updated Dockerfile base image (#6)

* Update build-config.yml (#12)

* Update CODEOWNERS

* Initial Commit

* initial Department entity service setup

* initial Department entity service setup

* Added build config for ifix-department-entity-service (#26)

* Updated context path and port number

* Rahu 313 (#27)

* IFIX-311: Create Department Hierarchy

* Merge branch 'ifix-department-entity-service' of https://github.com/egovernments/iFix-Dev into pk-ifix-department-entity-service

# Conflicts:
#	domain-services/ifix-department-entity-service/src/main/resources/application.properties

* IFIX-313: Department entity create api

* changed the level data tpe to Integer

* DepartmentEntity attribute correction

* refactor the GovernmentUtil and DepartmentUtil

* DepartmentEntity validation fix

Co-authored-by: pintu-eGov <[email protected]>

* removed unused object, imports

* Initialise create index file

* Pk ifix department entity service (#32)

* IFIX-311: Create Department Hierarchy

* Merge branch 'ifix-department-entity-service' of https://github.com/egovernments/iFix-Dev into pk-ifix-department-entity-service

# Conflicts:
#	domain-services/ifix-department-entity-service/src/main/resources/application.properties

* IFIX-313: Department entity create api

* changed the level data tpe to Integer

* IFIX-314: Search Department Hierarchy

Co-authored-by: pintu-eGov <[email protected]>
Co-authored-by: rahu-eGov <[email protected]>

* Department entity get parent (#33)

* Department Entity get parent.

* Return complete ancestry.

* Added seed data.

* Pk ifix department entity service (#35)

* IFIX-311: Create Department Hierarchy

* Merge branch 'ifix-department-entity-service' of https://github.com/egovernments/iFix-Dev into pk-ifix-department-entity-service

# Conflicts:
#	domain-services/ifix-department-entity-service/src/main/resources/application.properties

* IFIX-313: Department entity create api

* changed the level data tpe to Integer

* IFIX-314: Search Department Hierarchy

* IFIX-314: Search Department Entity

* Migration scripts

* Migration scripts

Co-authored-by: pintu-eGov <[email protected]>
Co-authored-by: rahu-eGov <[email protected]>

* seed data change and department ancestry attribute correction

* Updated seed data

Co-authored-by: rushang7-eGov <[email protected]>
Co-authored-by: nikesh-eGov <[email protected]>
Co-authored-by: pintu-eGov <[email protected]>
Co-authored-by: pintu-eGov <[email protected]>

* IFIX-320: New indexes for for fiscal event (#43)

* IFIX-320: New indexes for for fiscal event

* add department entity id

* add ancestry id

* IFIX-320: index correction

* IFIX-371 : fiscal event search api (#47)

Co-authored-by: pintu-eGov <[email protected]>

* Jmeter test plan for fiscal-event-service (#48)

Co-authored-by: rushang7-eGov <[email protected]>

* Updated README file (#49)

* Updated README file

* README changes

* Migration file rename (#50)

* Update INSTRUCTIONS.md (#51)

Co-authored-by: rushang7-eGov <[email protected]>

* Pk ifix 319 (#52)

* IFIX 319 : Create expenditure api

* IFIX-318: Department Entity create

Co-authored-by: pintu-eGov <[email protected]>

* Changed primary timestamp in druid config (#53)

Co-authored-by: rushang7-eGov <[email protected]>

* Ifix 379 (#54)

* Ifix 387 (#55)

* IFIX 387 : - Department entity master service

* IFIX-387 : fiscal event service

* IFIX-387: Master Data service reformat.

* IFIX-387: FiscalEvent Post Processor reformat.

* IFIX-387 : fiscal event service- renamed yaml file

* IFIX-387 : fiscal event service- renamed yaml file

* IFIX-387 : fiscal event service- renamed yaml file

* IFIX 387 : - Department entity master service--yaml file renamed

* IFIX-387: FiscalEvent Post Processor yaml file addition

* IFIX-387: Yaml file correction

Co-authored-by: pintu-eGov <[email protected]>

* Druid config (#56)

* Added transformSpec

* Updated JMeter test with csv

Co-authored-by: rushang7-eGov <[email protected]>

* documentation link and postman collection (#57)

* documentation link and postman collection

* link fix

* Update README.md

Co-authored-by: pintu-eGov <[email protected]>
Co-authored-by: rahu-eGov <[email protected]>
Co-authored-by: rushang7-eGov <[email protected]>

* Doc add (#58)

* Added the postman and documentation link

* redocly link fix

* redocly link fix1

* redocly link

Co-authored-by: pintu-eGov <[email protected]>
Co-authored-by: rahu-eGov <[email protected]>

* Postman collection and API redocly link (#59)

* Ifix 386 (#60)

* Add ps link (#61)

* Bug fix regarding refactor (#62)

* Null check for corrupted project data (#63)

Co-authored-by: pintu-eGov <[email protected]>

* Department Entity check at fiscal event push (#64)

* Bug fix department entity check while fetching from department entity service (#65)

* Kafka consumer lag issue (#67)

* Department entity children fix (#69)

* Hierarchy level zero addition (#70)

* Corrected collection name of fiscal event (#72)

* Updated the readme doc (#71)

* Updated the readme doc

* Updated the readme doc

Co-authored-by: pintu-eGov <[email protected]>

* Corrected collection name (#73)

* Corrected collection name of fiscal event

* fiscal event amount details

Co-authored-by: pintu-eGov <[email protected]>

* Update FiscalEventValidator.java (#74)

Removed the duplicate call of validate amount details

* CoaId null fix (#75)

Co-authored-by: pintu-eGov <[email protected]>

* Added utilities

* fiscal event id fix in search api (#76)

* fiscal event id fix in search api

* fiscal event id fix in search api

Co-authored-by: pintu-eGov <[email protected]>

* bug fix (#80)

Co-authored-by: pintu-eGov <[email protected]>

* Rahu mongo ck (#81)

* Mongo CK script for master data service

* Mongo CK for Fiscal Event

* Mongo CK for Department Entity Service

* adding more index into project collection.

* fiscal event index correction

* add extra line break

* Index fixes for department entity

* add extra line break and adding amount index

* add extra line

* Update application.properties

* Update application.properties

Co-authored-by: rushang7-eGov <[email protected]>

* Rahu index fix (#82)

* Remove index creation script file

* Removing index script

* remove index script

* Update README.md

Co-authored-by: rushang7-eGov <[email protected]>

* Resolve merge conflicts when merge Develop to master  (#84)

* Update build-config.yml (#3)

* Update build-config.yml (#4)

* Update build-config.yml (#5)

* Updated Dockerfile base image (#6)

* Update build-config.yml (#12)

* Update CODEOWNERS

* Added build config for ifix-department-entity-service (#26)

* IFIX-359 configure adaptor for build and deployment (#37)

* ifix-353 build config changes

* renaming to fiscal-event-aggregator (#68)

* Added utilities

* Update build-config.yml (#78)

updated the build config for aggregator and connector service

* Corrected indentation error (#79)

* Remove db-migration container (#83)

Co-authored-by: nikesh-eGov <[email protected]>
Co-authored-by: manikanta p t <[email protected]>
Co-authored-by: Priyanka-eGov <[email protected]>
Co-authored-by: Gajendran <[email protected]>
Co-authored-by: Priyanka-eGov <[email protected]>
Co-authored-by: nikesh-eGov <[email protected]>
Co-authored-by: pintu-eGov <[email protected]>

* Version update (#85)

* Updated Versions in domain services

* Updated versions in libraries

* Zuul version update

* Updated libraries version in all domain services

Co-authored-by: pintu-eGov <[email protected]>
Co-authored-by: pintu-eGov <[email protected]>
Co-authored-by: rahu-dev <[email protected]>
Co-authored-by: rahu-eGov <[email protected]>
Co-authored-by: nikesh-eGov <[email protected]>
Co-authored-by: GhanshyamRawat-eGov <[email protected]>
Co-authored-by: nikesh-eGov <[email protected]>
Co-authored-by: manikanta p t <[email protected]>
Co-authored-by: Priyanka-eGov <[email protected]>
Co-authored-by: Gajendran <[email protected]>
Co-authored-by: Priyanka-eGov <[email protected]>
rahu-eGov added a commit that referenced this pull request Jan 2, 2023
…PIs (#88)

* Update department entity has been added (#81)

* Update department entity has been added

* Id required field removed form DepartmentEntityRequest

* update swagger yaml file (#82)

Co-authored-by: pintu-eGov <[email protected]>

* Update department entity with junit and Sonar Lint. Pom and change log has been updated. (#84)

* IFIX-1010 : project update api with unit test case, code coverage,sonar fixes, changelog (#85)

* update swagger yaml file

* IFIX - 1010 : project update api with unit test case, code coverage,sonar fixes, changelog

* IFIX - 1010 : refactor the duplicate source code

Co-authored-by: pintu-eGov <[email protected]>

* Changing prameter type primitive to wrapper class (#86)

* Copying remaining attributes value in Department Entity response. (#87)

Co-authored-by: rahu-eGov <[email protected]>
Co-authored-by: pintu-eGov <[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.

2 participants