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.

Sign up for GitHub

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

Jump to bottom

Fiscal event aggregate #13

Closed
wants to merge 76 commits into from
Closed

Fiscal event aggregate #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
76 commits
Select commit Hold shift + click to select a range
f2d456b
Ifix master data service (#19)
pintu-eGov Aug 17, 2021
e08e80a
Ifix master patch (#20)
pintu-eGov Aug 18, 2021
1fa6c54
Update CODEOWNERS
nikesh2812 Aug 18, 2021
a94ca17
Ifix seed data (#21)
rahu-eGov Aug 19, 2021
7ebd307
ifix services common (#23)
rushang7 Aug 23, 2021
e262fde
Create .gitignore (#24)
GhanshyamRawat-eGov Aug 23, 2021
ee3dabf
Fiscal event post processor (#28)
pintu-eGov Aug 25, 2021
7d15f8c
Fiscal event service (#29)
pintu-eGov Aug 25, 2021
b46659d
Ifix zuul (#30)
pintu-eGov Aug 25, 2021
30a315f
Keycloak (#31)
pintu-eGov Aug 25, 2021
20e3ce1
Build config for department entity service (#34)
rushang7 Aug 25, 2021
f6a32b0
Convert enum to all caps (#36)
pintu-eGov Aug 26, 2021
537475b
Rahu 310 (#38)
rahu-eGov Aug 27, 2021
49e6f85
Refactored: responseInfo -> responseHeader (#39)
pintu-eGov Aug 27, 2021
179f2da
Pk department entity post processor (#40)
pintu-eGov Aug 27, 2021
544d7d7
Updated Druid ingestion config (#41)
pintu-eGov Aug 30, 2021
41dabb7
IFIX-320: EAT index refactor (#44)
rahu-eGov Aug 31, 2021
27b0de0
Ifix department entity service (#45)
rahu-eGov Aug 31, 2021
3b46cc0
IFIX-320: New indexes for for fiscal event (#43)
rahu-eGov Aug 31, 2021
8afc373
IFIX-371 : fiscal event search api (#47)
pintu-eGov Aug 31, 2021
a869bd5
Jmeter test plan for fiscal-event-service (#48)
rahu-eGov Sep 1, 2021
6c1e7b7
Updated README file (#49)
rahu-eGov Sep 1, 2021
d954343
Migration file rename (#50)
rahu-eGov Sep 1, 2021
2371d54
Update INSTRUCTIONS.md (#51)
pintu-eGov Sep 1, 2021
60e7f4f
Pk ifix 319 (#52)
rahu-eGov Sep 2, 2021
a041ac7
Changed primary timestamp in druid config (#53)
pintu-eGov Sep 2, 2021
be0ad8c
Ifix 379 (#54)
rahu-eGov Sep 3, 2021
f7a75c1
Ifix 387 (#55)
rahu-eGov Sep 3, 2021
7e117c6
Druid config (#56)
pintu-eGov Sep 4, 2021
8987f7e
documentation link and postman collection (#57)
pintu-eGov Sep 6, 2021
bf6167c
Doc add (#58)
pintu-eGov Sep 6, 2021
b7263db
Postman collection and API redocly link (#59)
rahu-eGov Sep 6, 2021
261767b
Ifix 386 (#60)
pintu-eGov Sep 6, 2021
d00ea74
Add ps link (#61)
rahu-eGov Sep 7, 2021
8ee00d2
Bug fix regarding refactor (#62)
rahu-eGov Sep 7, 2021
566fdfe
Null check for corrupted project data (#63)
pintu-eGov Sep 7, 2021
3c10113
Department Entity check at fiscal event push (#64)
rahu-eGov Sep 7, 2021
a4a62cd
Bug fix department entity check while fetching from department entity…
rahu-eGov Sep 7, 2021
6c38581
Kafka consumer lag issue (#67)
pintu-eGov Sep 8, 2021
14ba7c1
Department entity children fix (#69)
rahu-eGov Sep 8, 2021
3e585e7
Hierarchy level zero addition (#70)
rahu-eGov Sep 8, 2021
99f5901
Corrected collection name of fiscal event (#72)
pintu-eGov Sep 9, 2021
10e681a
Updated the readme doc (#71)
pintu-eGov Sep 9, 2021
89f2702
Corrected collection name (#73)
pintu-eGov Sep 9, 2021
0864eba
Update FiscalEventValidator.java (#74)
pintu-eGov Sep 9, 2021
2bdf8d0
CoaId null fix (#75)
pintu-eGov Sep 9, 2021
cad83fb
Added utilities
Sep 15, 2021
1dd5b95
initial aggregate setup
Pintu-Tegov Sep 15, 2021
e2825c9
Renamed the aggregator
Pintu-Tegov Sep 16, 2021
757458c
reanmed the service
Pintu-Tegov Sep 16, 2021
13dbe49
Moved to db folder
Pintu-Tegov Sep 16, 2021
c6b4a74
Re-indented .sql flie
rushang7 Sep 16, 2021
7887188
Merge branch 'master' of https://github.com/egovernments/iFix-Dev int…
Pintu-Tegov Sep 16, 2021
4025adf
Merge branch 'fiscal-event-aggregate' of https://github.com/egovernme…
Pintu-Tegov Sep 16, 2021
6da5161
first version of fiscal event aggregate
Pintu-Tegov Sep 22, 2021
f1f4c81
review comments
Pintu-Tegov Sep 22, 2021
2326370
Merge remote-tracking branch 'origin/master' into fiscal-event-aggregate
Pintu-Tegov Sep 22, 2021
b3a0c71
moved migration script into main folder
Pintu-Tegov Sep 22, 2021
ef03c8f
Removed dockerfile for flyway db migration
rushang7 Sep 22, 2021
ebe1790
Merge remote-tracking branch 'origin/master' into fiscal-event-aggregate
rushang7 Sep 22, 2021
630a2e3
Updated Flyway environment variable names
rushang7 Sep 23, 2021
60662e3
fiscal event aggregate : Pending collection & payment
Pintu-Tegov Sep 27, 2021
e73a58b
Merge branch 'fiscal-event-aggregate' of https://github.com/egovernme…
Pintu-Tegov Sep 27, 2021
7d21968
update issue fix for null coa id
Pintu-Tegov Sep 28, 2021
8e193d2
IFIX 557 : documentation
Pintu-Tegov Sep 28, 2021
6ef169b
Renamed EventType enum to Pascal_Case.
rushang7 Oct 8, 2021
022b876
IFIX-589 : Dynamic fiscal period
Pintu-Tegov Oct 20, 2021
7622163
IFIX-589 : Dynamic hierarchy level
Pintu-Tegov Oct 21, 2021
c42b28c
IFIX-590 : Dynamic hierarchy level
Pintu-Tegov Oct 21, 2021
90bbf4a
Merge pull request #2 from misdwss/ifix-590
rushang7 Oct 21, 2021
8c021cd
named parameters (for query maintenance)
Pintu-Tegov Oct 22, 2021
669558b
Merge branch 'fiscal-event-aggregate' of https://github.com/misdwss/i…
Pintu-Tegov Oct 22, 2021
c376f99
Merge pull request #3 from misdwss/ifix-590
rushang7 Oct 22, 2021
cea6057
Merge branch 'develop' of https://github.com/misdwss/iFix-Dev into fi…
Pintu-Tegov Nov 22, 2021
208beec
removed commented code
Pintu-Tegov Nov 23, 2021
9369932
removed unused test file
Pintu-Tegov Nov 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
146 changes: 73 additions & 73 deletions core/libraries/ifix-services-common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,73 +1,73 @@
<?xml version="1.0" encoding="UTF-8"?>
Copy link

Choose a reason for hiding this comment

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

Why are there any changes to this file?

Copy link
Author

Choose a reason for hiding this comment

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

haven't done any changes in this file. while taking pull from develop and got conflict and accepted the develop branch one.

<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0">
<modelVersion>4.0.0</modelVersion>
<groupId>org.egov.services</groupId>
<artifactId>ifix-services-common</artifactId>
<name>ifix-services-common</name>
<version>1.0.0-SNAPSHOT</version>
<description>Shared classes among services</description>
<properties>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<distributionManagement>
<repository>
<id>repo.digit.org</id>
<name>eGov ERP Releases Repository</name>
<url>https://nexus-repo.digit.org/nexus/content/repositories/releases/</url>
</repository>
<snapshotRepository>
<id>repo.digit.org</id>
<name>eGov ERP Snapshots Repository</name>
<url>https://nexus-repo.digit.org/nexus/content/repositories/snapshots/</url>
</snapshotRepository>
</distributionManagement>
<dependencies>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.16.12</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>2.8.7</version>
</dependency>
<dependency>
<groupId>jakarta.validation</groupId>
<artifactId>jakarta.validation-api</artifactId>
<version>2.0.2</version>
<scope>compile</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>8</source>
<target>8</target>
</configuration>
</plugin>
<plugin>
<artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0">
<modelVersion>4.0.0</modelVersion>
<groupId>org.egov.services</groupId>
<artifactId>ifix-services-common</artifactId>
<name>ifix-services-common</name>
<version>1.0.0-SNAPSHOT</version>
<description>Shared classes among services</description>

<properties>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<distributionManagement>
<repository>
<id>repo.digit.org</id>
<name>eGov ERP Releases Repository</name>
<url>https://nexus-repo.digit.org/nexus/content/repositories/releases/</url>
</repository>
<snapshotRepository>
<id>repo.digit.org</id>
<name>eGov ERP Snapshots Repository</name>
<url>https://nexus-repo.digit.org/nexus/content/repositories/snapshots/</url>
</snapshotRepository>
</distributionManagement>

<dependencies>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.16.12</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>2.8.7</version>
</dependency>
<dependency>
<groupId>jakarta.validation</groupId>
<artifactId>jakarta.validation-api</artifactId>
<version>2.0.2</version>
<scope>compile</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>8</source>
<target>8</target>
</configuration>
</plugin>
<plugin>
<artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
Loading