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

Downsync smc referral module #554

Closed
wants to merge 44 commits into from
Closed

Downsync smc referral module #554

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
407c2bb
added downsync dummy api
kavi-egov Oct 26, 2023
c10f4ff
added downsync dummy api with res
kavi-egov Oct 26, 2023
8be1c33
HLM-4062: added count api changes for household
kanishq-egov Oct 23, 2023
5785960
HLM-4062: Updated findbyid references
kanishq-egov Oct 23, 2023
7041a61
HLM-3376: review comments commit
kanishq-egov Oct 12, 2023
f57c19e
HLM-3069: side effect code comments, code refactor
kanishq-egov Oct 15, 2023
2d61014
HLM-3376: code review comments and code refactoring
kanishq-egov Oct 16, 2023
942b34f
updated the common-models version to 1.0.10, and updated in dependent…
kanishq-egov Oct 18, 2023
6f788cd
HLM-3376 : Added additional field in side effect, referral.
kanishq-egov Oct 19, 2023
706970a
HLM-3376: missing column fix
kanishq-egov Oct 19, 2023
ff14ec9
HLM-3372: constants type changed
kanishq-egov Oct 19, 2023
20b6622
HLM-3376: removed not used validators
kanishq-egov Oct 19, 2023
cd2cb9c
code refactor and code comments
kanishq-egov Oct 19, 2023
dcb3f6c
hlm-3376: added test cases
kanishq-egov Oct 20, 2023
d8c2934
hlm-3376: referralmanagement context in test cases
kanishq-egov Oct 20, 2023
d8fee78
hlm-3376: changed parameters for find by id
kanishq-egov Oct 20, 2023
9945fa6
HLM-3372: typo fix
kanishq-egov Oct 20, 2023
1324ea8
hlm-3376: persister changes, removed invalid parameters
kanishq-egov Oct 20, 2023
fafe9d4
hlm-3372: added changes as per code review, removed unused properties
kanishq-egov Oct 20, 2023
2c48a54
hlm-3376: recipient validator for faciliy not working fix
kanishq-egov Oct 23, 2023
a37b17c
HLM-3376: throwing exception on invalid recipient type
kanishq-egov Oct 23, 2023
ef3073d
HLM-4062: Updated pom.xml of household
kanishq-egov Oct 23, 2023
33678b7
Hlm 3376 reviewcomments (#524)
kanishq-egov Oct 26, 2023
29ca163
Dev (#537)
kavi-egov Oct 26, 2023
44211df
Added project beneficiary tag field
kanishq-egov Oct 26, 2023
9a3a3a7
Merge remote-tracking branch 'origin/downsync-smc-referral-module' in…
kanishq-egov Oct 26, 2023
280aecc
renamed project beneficiary tag to voucher tag
kanishq-egov Oct 26, 2023
da2dad5
Merge pull request #538 from egovernments/project-beneficiary-tag-field
kanishq-egov Oct 26, 2023
8a04171
Hlm 4062 count api (#547) (#548)
kavi-egov Nov 2, 2023
e0a956e
Project beneficiary tag cherrypick (#549)
kavi-egov Nov 2, 2023
ba94e92
dummy api with same pagination response
kavi-egov Nov 2, 2023
80f1282
dummy api with same pagination response
kavi-egov Nov 2, 2023
1646d40
dummy api with same pagination response
kavi-egov Nov 2, 2023
48bf5db
downsync data test
kavi-egov Nov 6, 2023
389c268
data integrated till beneficiary
kavi-egov Nov 6, 2023
fb30b0e
Update CHANGELOG.md
kavi-egov Nov 6, 2023
9b71e48
Delete health-services/project/src/main/resources/project-persistor.yml
kavi-egov Nov 6, 2023
71e3d36
skip on empty result added
kavi-egov Nov 6, 2023
9481447
skip on empty result added
kavi-egov Nov 6, 2023
16ee8db
beneficary searhc based on individual clientref id added
kavi-egov Nov 6, 2023
b3c9288
sideeffetc, ref, task fetch added
kavi-egov Nov 6, 2023
8961871
tasks earch fix
kavi-egov Nov 6, 2023
7af5b3e
referral search fix
kavi-egov Nov 6, 2023
8c5ccdd
Merge branch 'dev' into downsync-smc-referral-module
kavi-egov Nov 7, 2023
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
19 changes: 10 additions & 9 deletions ...h-services/household/src/main/java/org/egov/household/repository/HouseholdRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
package org.egov.household.repository;

import lombok.extern.slf4j.Slf4j;
import static org.egov.common.utils.CommonUtils.getIdMethod;

import java.lang.reflect.Method;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.stream.Collectors;

import org.egov.common.data.query.builder.GenericQueryBuilder;
import org.egov.common.data.query.builder.QueryFieldChecker;
import org.egov.common.data.query.builder.SelectQueryBuilder;
Expand All @@ -17,14 +25,7 @@
import org.springframework.stereotype.Repository;
import org.springframework.util.ReflectionUtils;

import java.lang.reflect.Method;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.stream.Collectors;

import static org.egov.common.utils.CommonUtils.getIdMethod;
import lombok.extern.slf4j.Slf4j;

@Repository
@Slf4j
Expand Down
4 changes: 4 additions & 0 deletions health-services/libraries/health-services-models/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
All notable changes to this module will be documented in this file.

## 1.0.10
- downsync models added
- boundarycode changed to localityCode in household search

## 1.0.9
- stock models updated with sender and receiver information fields.

Expand Down
10 changes: 6 additions & 4 deletions ...ealth-services-models/src/main/java/org/egov/common/models/household/HouseholdSearch.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
package org.egov.common.models.household;

import java.util.List;

import org.springframework.validation.annotation.Validated;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;

import io.swagger.annotations.ApiModel;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.springframework.validation.annotation.Validated;

import java.util.List;

/**
* A representation of Household.
Expand All @@ -34,7 +36,7 @@ public class HouseholdSearch {
// @JsonProperty("memberCount")
// private Integer memberCount = null;

@JsonProperty("boundaryCode")
@JsonProperty("localityCode")
private String localityCode = null;
}

6 changes: 5 additions & 1 deletion .../java/org/egov/common/models/referralmanagement/beneficiarydownsync/DownsyncCriteria.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ public class DownsyncCriteria {

private Long lastSyncedTime;

private String projectId;

private String tenantId;

@Default
private Boolean includeDeleted = false;

Expand All @@ -25,6 +29,6 @@ public class DownsyncCriteria {
@Default
private Integer limit = 50;

private Integer totalCount;
private Long totalCount;
}

265 changes: 135 additions & 130 deletions health-services/referralmanagement/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,136 +1,141 @@
<?xml version="1.0" encoding="UTF-8"?>

<project xmlns="http://maven.apache.org/POM/4.0.0" 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">
<modelVersion>4.0.0</modelVersion>
<project xmlns="http://maven.apache.org/POM/4.0.0" 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">
<modelVersion>4.0.0</modelVersion>

<groupId>org.egov</groupId>
<artifactId>referralmanagement</artifactId>
<packaging>jar</packaging>
<name>referralmanagement</name>
<version>1.0.0</version>
<properties>
<java.version>1.8</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
</properties>
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.2.6.RELEASE</version>
</parent>
<build>
<sourceDirectory>src/main/java</sourceDirectory>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>repackage</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-jdbc</artifactId>
</dependency>
<dependency>
<groupId>org.egov.common</groupId>
<artifactId>health-services-common</artifactId>
<version>1.0.8-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.egov.common</groupId>
<artifactId>health-services-models</artifactId>
<version>1.0.10-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-redis</artifactId>
<exclusions>
<exclusion>
<groupId>io.lettuce</groupId>
<artifactId>lettuce-core</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>redis.clients</groupId>
<artifactId>jedis</artifactId>
</dependency>
<dependency>
<groupId>org.flywaydb</groupId>
<artifactId>flyway-core</artifactId>
</dependency>
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>42.2.2.jre7</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<groupId>org.egov</groupId>
<artifactId>referralmanagement</artifactId>
<packaging>jar</packaging>
<name>referralmanagement</name>
<version>1.0.0</version>
<properties>
<java.version>1.8</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
</properties>
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.2.6.RELEASE</version>
</parent>
<build>
<sourceDirectory>src/main/java</sourceDirectory>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>repackage</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-jdbc</artifactId>
</dependency>
<dependency>
<groupId>org.egov.common</groupId>
<artifactId>health-services-common</artifactId>
<version>1.0.12-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.egov.common</groupId>
<artifactId>health-services-models</artifactId>
<version>1.0.10-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-redis</artifactId>
<exclusions>
<exclusion>
<groupId>io.lettuce</groupId>
<artifactId>lettuce-core</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>redis.clients</groupId>
<artifactId>jedis</artifactId>
</dependency>
<dependency>
<groupId>org.flywaydb</groupId>
<artifactId>flyway-core</artifactId>
</dependency>
<!-- https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-devtools -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-devtools</artifactId>
</dependency>

<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-core</artifactId>
<version>1.5.18</version>
</dependency>
<!-- Egov dependencies -->
<dependency>
<groupId>org.egov.services</groupId>
<artifactId>digit-models</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
</dependency>
<!-- Bean Validation API support -->
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
</dependency>
</dependencies>
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>42.2.2.jre7</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>

<repositories>
<repository>
<id>repo.egovernments.org</id>
<name>eGov ERP Releases Repository</name>
<url>https://nexus-repo.egovernments.org/nexus/content/repositories/releases/</url>
</repository>
<repository>
<id>repo.egovernments.org.snapshots</id>
<name>eGov ERP Releases Repository</name>
<url>https://nexus-repo.egovernments.org/nexus/content/repositories/snapshots/</url>
</repository>
<repository>
<id>repo.egovernments.org.public</id>
<name>eGov Public Repository Group</name>
<url>https://nexus-repo.egovernments.org/nexus/content/groups/public/</url>
</repository>
<repository>
<id>repo.digit.org</id>
<name>eGov DIGIT Releases Repository</name>
<url>https://nexus-repo.digit.org/nexus/content/repositories/snapshots/</url>
</repository>
</repositories>
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-core</artifactId>
<version>1.5.18</version>
</dependency>
<!-- Egov dependencies -->
<dependency>
<groupId>org.egov.services</groupId>
<artifactId>digit-models</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
</dependency>
<!-- Bean Validation API support -->
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
</dependency>
</dependencies>

<repositories>
<repository>
<id>repo.egovernments.org</id>
<name>eGov ERP Releases Repository</name>
<url>https://nexus-repo.egovernments.org/nexus/content/repositories/releases/</url>
</repository>
<repository>
<id>repo.egovernments.org.snapshots</id>
<name>eGov ERP Releases Repository</name>
<url>https://nexus-repo.egovernments.org/nexus/content/repositories/snapshots/</url>
</repository>
<repository>
<id>repo.egovernments.org.public</id>
<name>eGov Public Repository Group</name>
<url>https://nexus-repo.egovernments.org/nexus/content/groups/public/</url>
</repository>
<repository>
<id>repo.digit.org</id>
<name>eGov DIGIT Releases Repository</name>
<url>https://nexus-repo.digit.org/nexus/content/repositories/snapshots/</url>
</repository>
</repositories>
</project>
Loading