Skip to content

Commit

Permalink
Merge branch 'master' into console-v0.3
Browse files Browse the repository at this point in the history
  • Loading branch information
jagankumar-egov authored Nov 8, 2024
2 parents da89ad0 + d4fd0c9 commit c4f6206
Showing 16 changed files with 86 additions and 18 deletions.
36 changes: 36 additions & 0 deletions .github/workflows/branch-name-validator.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
name: Enforce Branch Naming Convention

on:
push:
branches:
- "*"
pull_request:
branches:
- "*"

jobs:
branch-name-check:
runs-on: ubuntu-latest
steps:
- name: Check out repository
uses: actions/checkout@v4

- name: Enforce branch naming convention
run: |
# Get the branch name
branch_name=$(echo "${GITHUB_REF#refs/heads/}")
# Define the branch name pattern
branch_regex="^(master|develop|(HCMPRE|HCMPOST|HCMSUB)-[0-9]{3,}-[a-zA-Z0-9-]+)$"
# Check if the branch name matches the pattern
if [[ ! "$branch_name" =~ $branch_regex ]]; then
echo "Branch name '$branch_name' does not follow the required naming convention."
echo "Branch names must follow the pattern: (HCMPRE|HCMPOST|HCMSUB)-123-description"
exit 1
fi
- name: Success message
run: |
branch_name=$(echo "${GITHUB_REF#refs/heads/}")
echo "Branch name '$branch_name' follows the required naming convention: 'master', 'develop', or (HCMPRE|HCMPOST|HCMSUB)-123-description"
13 changes: 10 additions & 3 deletions build/build-config.yml
Original file line number Diff line number Diff line change
@@ -250,15 +250,22 @@ config:
dockerfile: "build/17/maven/Dockerfile"
- work-dir: "health-services/plan-service/src/main/resources/db"
image-name: "plan-service-db"
- name: "builds/health-campaign-services/health-services/resource-estimation-service"
- name: "builds/health-campaign-services/health-services/resource-generator"
build:
- work-dir: "health-services/resource-estimation-service"
image-name: "resource-estimation-service"
- work-dir: "health-services/resource-generator"
image-name: "resource-generator"
dockerfile: "build/17/maven/Dockerfile"
- name: "builds/health-campaign-services/analytics/auth-proxy"
build:
- work-dir: "analytics/auth-proxy"
image-name: "auth-proxy"
- name: "builds/health-campaign-services/health-services/census-service"
build:
- work-dir: "health-services/census-service"
image-name: "census-service"
dockerfile: "build/17/maven/Dockerfile"
- work-dir: "health-services/census-service/src/main/resources/db"
image-name: "census-service-db"

# frontend
- name: builds/health-campaign-services/frontend/workbench-ui
Original file line number Diff line number Diff line change
@@ -32,13 +32,15 @@ public HRMSUtil(ServiceRequestRepository serviceRequestRepository, PGRConfigurat

/**
* Gets the list of department for the given list of uuids of employees
* @param uuids
*
* @param uuids user uuids
* @param employeeUuids employee uuids
* @param requestInfo
* @return
*/
public List<String> getDepartment(List<String> uuids, RequestInfo requestInfo){
public List<String> getDepartment(List<String> uuids, List<String> employeeUuids, RequestInfo requestInfo){

StringBuilder url = getHRMSURI(uuids);
StringBuilder url = getHRMSURI(employeeUuids);

RequestInfoWrapper requestInfoWrapper = RequestInfoWrapper.builder().requestInfo(requestInfo).build();

Original file line number Diff line number Diff line change
@@ -159,10 +159,12 @@ private void validateDepartment(ServiceRequest request, Object mdmsData){
String serviceCode = request.getService().getServiceCode();
List<String> assignes = request.getWorkflow().getAssignes();

List<String> hrmsAssignes = request.getWorkflow().getHrmsAssignees();

if(CollectionUtils.isEmpty(assignes))
return;

List<String> departments = hrmsUtil.getDepartment(assignes, request.getRequestInfo());
List<String> departments = hrmsUtil.getDepartment(assignes, hrmsAssignes, request.getRequestInfo());

String jsonPath = MDMS_DEPARTMENT_SEARCH.replace("{SERVICEDEF}",serviceCode);

Original file line number Diff line number Diff line change
@@ -113,7 +113,7 @@ public ResponseEntity<String> requestsUpdatePost() throws IOException {
public ResponseEntity<List<String>> requestsTest(@RequestBody RequestInfoWrapper requestInfoWrapper,
@RequestParam String tenantId, @RequestParam List<String> uuids) {

List<String> department = hrmsUtil.getDepartment(uuids, requestInfoWrapper.getRequestInfo());
List<String> department = hrmsUtil.getDepartment(uuids, uuids, requestInfoWrapper.getRequestInfo());

return new ResponseEntity<>(department, HttpStatus.OK);
}
Original file line number Diff line number Diff line change
@@ -35,6 +35,10 @@ public class Workflow {
@Valid
private List<String> assignes = null;

@JsonProperty("hrmsAssignes")
@Valid
private List<String> hrmsAssignees = null;

@SafeHtml
@JsonProperty("comments")
private String comments = null;
4 changes: 4 additions & 0 deletions core-services/service-request/CHANGELOG.md
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.1 - 2024-08-29

- Added `BOOLEAN` DataType in `AttributeDefinition`

## 1.0.0

- Base version
2 changes: 1 addition & 1 deletion core-services/service-request/pom.xml
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
<artifactId>service-request</artifactId>
<packaging>jar</packaging>
<name>service-request</name>
<version>1.0.0</version>
<version>1.0.1</version>
<properties>
<java.version>1.8</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
Original file line number Diff line number Diff line change
@@ -60,7 +60,9 @@ public enum DataTypeEnum {

MULTIVALUELIST("MultiValueList"),

FILE("File");
FILE("File"),

BOOLEAN("Boolean");

private String value;

12 changes: 9 additions & 3 deletions health-services/household/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
All notable changes to this module will be documented in this file.

## 1.1.3 - 2024-05-29
- Integrated Core 2.9LTS
## 1.1.4 - 2024-08-29

- Added `ExistentEntityValidator` fixes

## 1.1.3 - 2024-05-29

- Integrated Core 2.9 LTS
- Client reference ID validation added
- Upgraded to health models 1.0.20 and health common 1.0.16
- Boundary v2 Integration
@@ -11,8 +16,9 @@ All notable changes to this module will be documented in this file.
- Upgraded Flyway-Core to 9.22.3

## 1.1.2 - 2024-05-10

- Integrated Boundary v2 functionality
-

## 1.1.1 - 2023-11-15

- Added total count for household
2 changes: 1 addition & 1 deletion health-services/household/pom.xml
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
<artifactId>household</artifactId>
<packaging>jar</packaging>
<name>household</name>
<version>1.1.3</version>
<version>1.1.4</version>
<properties>
<java.version>17</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
8 changes: 5 additions & 3 deletions health-services/individual/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
All notable changes to this module will be documented in this file.

## 1.1.6 - 2024-08-29

- Added `ExistentEntityValidator` fixes

## 1.1.5 - 2024-05-29

## 1.1.5 - 2024-05-29
- Integrated Core 2.9LTS
- Client reference ID validation added
- Upgraded to health models 1.0.20 and health common 1.0.16
@@ -24,8 +28,6 @@ All notable changes to this module will be documented in this file.

- Added proximity based search support

## 1.1.0


## 1.0.0

2 changes: 1 addition & 1 deletion health-services/individual/pom.xml
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
<artifactId>individual</artifactId>
<packaging>jar</packaging>
<name>individual</name>
<version>1.1.5</version>
<version>1.1.6</version>
<properties>
<java.version>17</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
1 change: 1 addition & 0 deletions health-services/project/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -13,6 +13,7 @@ All notable changes to this module will be documented in this file.
- Upgraded PostgresSQL Driver version to 42.7.1
- Upgraded Flyway base image version to 10.7.1 for DB Migration
- Upgraded Flyway-Core to 9.22.3
- Added `ExistentEntityValidator` fixes

## 1.1.2 - 2024-02-26
- Implemented validation for updating project start date and end date.
1 change: 1 addition & 0 deletions health-services/referralmanagement/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -3,6 +3,7 @@ All notable changes to this module will be documented in this file.

## 1.0.3 - 2024-08-09
- Upgraded downsync logic.
- Added `ExistentEntityValidator` fixes


## 1.0.2 - 2024-05-29
1 change: 1 addition & 0 deletions health-services/stock/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -8,6 +8,7 @@ All notable changes to this module will be documented in this file.
- Upgraded PostgresSQL Driver version to 42.7.1
- Upgraded Flyway base image version to 10.7.1 for DB Migration
- Upgraded Flyway-Core to 9.22.3
- Added `ExistentEntityValidator` fixes

## 1.1.2 - 2024-02-26
- Enhance inventory flow with sender id and receiver id added.

0 comments on commit c4f6206

Please sign in to comment.