Skip to content

Master tqm merge #1693

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

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
89 commits
Select commit Hold shift + click to select a range
31421cd
Update build-config for TQM services
JithendarKumar-eGov Jul 18, 2024
d3ff9d4
Merge pull request #42 from egovernments/JithendarKumar-eGov-patch-1
vinothrallapalli-eGov Jul 18, 2024
ed64f63
Update build-config.yml
JithendarKumar-eGov Jul 18, 2024
54bdd56
Merge pull request #43 from egovernments/JithendarKumar-eGov-patch-1
JithendarKumar-eGov Jul 18, 2024
d2d59ba
Update build-config.yml
JithendarKumar-eGov Jul 18, 2024
63a3e9d
Merge pull request #44 from egovernments/JithendarKumar-eGov-patch-1
JithendarKumar-eGov Jul 18, 2024
2185de5
Update build-config.yml
JithendarKumar-eGov Jul 18, 2024
b9c4b03
Merge pull request #45 from egovernments/JithendarKumar-eGov-patch-1
JithendarKumar-eGov Jul 18, 2024
95254d6
Update build-config.yml
JithendarKumar-eGov Jul 19, 2024
f33b162
Merge pull request #46 from egovernments/JithendarKumar-eGov-patch-1
JithendarKumar-eGov Jul 19, 2024
a76202a
Update build-config.yml
JithendarKumar-eGov Jul 19, 2024
e2d463f
Merge pull request #47 from egovernments/JithendarKumar-eGov-patch-1
vinothrallapalli-eGov Jul 19, 2024
6605ed7
Merge branch 'upyog:master' into master
vinothrallapalli-eGov Aug 29, 2024
abc0b25
Merge branch 'upyog:master' into master
vinothrallapalli-eGov Sep 4, 2024
5ba7887
Merge branch 'upyog:master' into master
vinothrallapalli-eGov Sep 4, 2024
096672f
TQM frontend code
vinothrallapalli-eGov Sep 5, 2024
51148c9
Update build-config.yml
vinothrallapalli-eGov Sep 5, 2024
59d3145
Update build-config.yml
vinothrallapalli-eGov Sep 5, 2024
17735b9
Update .babelrc
vinothrallapalli-eGov Sep 6, 2024
c204717
Update webpack.config.js
vinothrallapalli-eGov Sep 6, 2024
4b41889
Update Dockerfile
vinothrallapalli-eGov Sep 9, 2024
5108c2e
Update index.html
vinothrallapalli-eGov Sep 9, 2024
3080217
Update nginx.conf
vinothrallapalli-eGov Sep 9, 2024
0099d47
Update index.html
vinothrallapalli-eGov Sep 9, 2024
9d7d42c
Update Dockerfile
vinothrallapalli-eGov Sep 11, 2024
1508c16
Merge branch 'upyog:master' into tqm-latest
vinothrallapalli-eGov Sep 13, 2024
ef835a1
Merge branch 'upyog:master' into tqm-latest
vinothrallapalli-eGov Sep 17, 2024
ca6fedd
All changes done
mukund-egov Sep 17, 2024
0cd650c
All changes done for ISNE-223
mukund-egov Sep 17, 2024
c578433
Merge branch 'ISNE-223' of https://github.com/egovernments/upyog into…
mukund-egov Sep 17, 2024
f12c308
Corrected tqm-ui part
mukund-egov Sep 17, 2024
61db13a
Corrected tqm-ui part
mukund-egov Sep 17, 2024
142e204
Update index.js
mukund-egov Sep 17, 2024
5e5deb8
Update AcceptDso.js
mukund-egov Sep 17, 2024
57f8bf7
Update index.js
mukund-egov Sep 17, 2024
9563212
Add publish file
vinothrallapalli-eGov Sep 17, 2024
b0b1e79
Merge pull request #52 from egovernments/ISNE-223
vinothrallapalli-eGov Sep 17, 2024
f218f6b
Added WorkerConfig.js
mukund-egov Sep 17, 2024
e76e947
Merge pull request #53 from egovernments/ISNE-223
vinothrallapalli-eGov Sep 18, 2024
e869c1f
Corrected FormComposerV2 Error
mukund-egov Sep 18, 2024
565e397
Merge pull request #54 from egovernments/ISNE-223
vinothrallapalli-eGov Sep 18, 2024
bba533f
Merge branch 'upyog:master' into tqm-latest
vinothrallapalli-eGov Sep 19, 2024
1b37e38
Merge branch 'upyog:master' into tqm-latest
vinothrallapalli-eGov Sep 20, 2024
6a2962c
Merge branch 'upyog:master' into master
vinothrallapalli-eGov Sep 23, 2024
020f44b
Remove css from workspace
vinothrallapalli-eGov Sep 26, 2024
0db6f66
Merge branch 'upyog:master' into master
vinothrallapalli-eGov Sep 27, 2024
8772587
Merge branch 'master' into tqm-latest
vinothrallapalli-eGov Sep 27, 2024
e4bf9f8
Merge branch 'upyog:master' into master
vinothrallapalli-eGov Nov 4, 2024
a5eb093
Navigation from digit-ui to tqm-ui
mukund-egov Nov 4, 2024
95d65b8
Navigation from digit-ui to tqm-ui1
mukund-egov Nov 4, 2024
7fb5bd7
Added css
mukund-egov Nov 4, 2024
e645188
Merge branch 'tqm-latest' of https://github.com/egovernments/upyog in…
mukund-egov Nov 4, 2024
c4d0d87
Reverted css changes
mukund-egov Nov 5, 2024
7478c0b
Solved css issue
mukund-egov Nov 5, 2024
157f9c2
Solved help button issue
mukund-egov Nov 5, 2024
43d1eab
Resolved version mismatch
mukund-egov Nov 5, 2024
7a0b3ef
resolved build issue
mukund-egov Nov 6, 2024
c73e3d7
Reverted build issue change
mukund-egov Nov 6, 2024
4c054cd
Resolved tqm card issue
mukund-egov Nov 6, 2024
43a0480
Added tqm module in App.js
mukund-egov Nov 6, 2024
e5989ae
modified package.json
mukund-egov Nov 6, 2024
d6fb880
updated package.jsons
mukund-egov Nov 6, 2024
f88ef33
modified tqm card
mukund-egov Nov 6, 2024
323d311
Resolved tqm_operator redirection issue
mukund-egov Nov 6, 2024
1aea0b7
Tried different way of redirection
mukund-egov Nov 6, 2024
a1b5f71
tqmcard issue
mukund-egov Nov 6, 2024
badaea0
Solved localisation issue
mukund-egov Nov 6, 2024
c5a65e5
solved share button issue
mukund-egov Nov 6, 2024
077fdae
Navigation problem
mukund-egov Nov 6, 2024
9714089
navigation issue res
mukund-egov Nov 7, 2024
f57ec01
resolved navigation issue
mukund-egov Nov 7, 2024
15edb9e
final commit
mukund-egov Nov 7, 2024
292207d
Merge pull request #57 from egovernments/tqm-navigation
vinothrallapalli-eGov Nov 7, 2024
976f968
Merge branch 'master-tqm-merge' into tqm-latest
vinothrallapalli-eGov Nov 7, 2024
0c3936f
Resolved build issue of micro-ui digit-ui
mukund-egov Nov 8, 2024
b440114
resolved build issue prod
mukund-egov Nov 8, 2024
ca259c6
ISNE:349 Attached document problem resolved
mukund-egov Nov 8, 2024
928c599
Resolved build issue-3
mukund-egov Nov 8, 2024
d8d7060
resolved formcomposerv2 problem
mukund-egov Nov 8, 2024
e8176fe
Merge branch 'upyog:master' into master-tqm-merge
vinothrallapalli-eGov Nov 15, 2024
47a8ecc
TQM code
JithendarKumar-eGov Nov 15, 2024
17e7310
TQM code
JithendarKumar-eGov Nov 15, 2024
64ed8b5
TQM code
JithendarKumar-eGov Nov 15, 2024
03fd3a7
TQM code
JithendarKumar-eGov Nov 15, 2024
a5671f3
Merge branch 'upyog:master' into master
vinothrallapalli-eGov Nov 27, 2024
db244e9
Merge branch 'upyog:master' into master-tqm-merge
vinothrallapalli-eGov Nov 27, 2024
f86f8db
Merge branch 'master' into master-tqm-merge
vinothrallapalli-eGov Jan 28, 2025
8023e38
Merge branch 'master' into master-tqm-merge
vinothrallapalli-eGov Feb 10, 2025
1f800d1
Reverted V20180731215512__alter_eg_role_address file changes
vinothrallapalli-eGov Feb 10, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
22 changes: 22 additions & 0 deletions .github/workflows/publishAllPackages.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: Node.js Publish UI Packages

on:
push:

branches: [ 'tqm-latest' ]

paths:
- 'frontend/micro-ui/web/micro-ui-internals/**'

jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
with:
node-version: 14.20.0
registry-url: https://registry.npmjs.org
- run: cd frontend/micro-ui/web/micro-ui-internals/ && bash ./publish-beta.sh
env:
NODE_AUTH_TOKEN: ${{secrets.npm_token}}
35 changes: 35 additions & 0 deletions build/build-config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -416,6 +416,13 @@ config:
dockerfile: "build/maven/Dockerfile"
- work-dir: "core-services/mdms-v2/src/main/resources/db"
image-name: "mdms-v2-db"
- name: "builds/upyog/core-services/individual"
build:
- work-dir: "core-services/individual"
image-name: "individual"
dockerfile: "build/maven/Dockerfile"
- work-dir: "core-services/individual/src/main/resources/db"
image-name: "individual-db"

#Municipal Services

Expand Down Expand Up @@ -633,6 +640,28 @@ config:
dockerfile: "build/maven/Dockerfile"
- work-dir: "municipal-services/birth-registration/src/main/resources/db"
image-name: "birth-registration-db"

- name: 'builds/upyog/municipal-services/pqm'
build:
- work-dir: 'municipal-services/pqm'
image-name: 'pqm-service'
dockerfile: 'build/maven/Dockerfile'
- work-dir: 'municipal-services/pqm/src/main/resources/db'
image-name: 'pqm-service-db'

- name: 'builds/upyog/municipal-services/pqm-scheduler'
build:
- work-dir: 'municipal-services/pqm-scheduler'
image-name: 'pqm-scheduler'
dockerfile: 'municipal-services/pqm-scheduler/Dockerfile'

- name: 'builds/upyog/municipal-services/pqm-anomaly-finder'
build:
- work-dir: 'municipal-services/pqm-anomaly-finder'
image-name: 'pqm-anomaly-finder'
dockerfile: 'build/maven/Dockerfile'
- work-dir: 'municipal-services/pqm-anomaly-finder/src/main/resources/db'
image-name: 'pqm-anomaly-finder-db'

# Utilities

Expand Down Expand Up @@ -770,6 +799,12 @@ config:
- work-dir: frontend/workbench-ui/
dockerfile: frontend/workbench-ui/web/workbench/Dockerfile
image-name: workbench-ui
- name: builds/upyog/frontend/micro-ui/tqm-ui
build:
- work-dir: frontend/tqm-ui/
dockerfile: frontend/tqm-ui/web/docker/Dockerfile
image-name: tqm-ui
#EDCR

- name: builds/upyog/edcr/dcr-client/egov-dcr
build:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ ALTER TABLE eg_userrole DROP CONSTRAINT IF EXISTS eg_userrole_userid_fkey;
ALTER TABLE eg_user_address DROP CONSTRAINT IF EXISTS eg_user_address_user_fkey;

ALTER TABLE eg_userrole ADD CONSTRAINT eg_userrole_userid_fkey FOREIGN KEY (userid, tenantid) REFERENCES eg_user (id, tenantid) ON UPDATE CASCADE ON DELETE CASCADE;
ALTER TABLE eg_user_address ADD CONSTRAINT eg_user_address_user_fkey FOREIGN KEY (userid, tenantid) REFERENCES eg_user (id, tenantid) ON UPDATE CASCADE ON DELETE CASCADE;
ALTER TABLE eg_user_address ADD CONSTRAINT eg_user_address_user_fkey FOREIGN KEY (userid, tenantid) REFERENCES eg_user (id, tenantid) ON UPDATE CASCADE ON DELETE CASCADE;
Empty file.
7 changes: 7 additions & 0 deletions core-services/individual/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
.DS_Store
frontend/micro-ui-internals/node_modules/*
.idea
index.lock
/individual.iml
/target/
/.idea/
16 changes: 16 additions & 0 deletions core-services/individual/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
All notable changes to this module will be documented in this file.

## 1.1.2
- upgraded version from beta

## 1.1.2-beta

- Added proximity based search support

## 1.1.0


## 1.0.0

- Base version

31 changes: 31 additions & 0 deletions core-services/individual/LOCALSETUP.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
# Local Setup

To setup the Individual service in your local system, clone the [Health campaign services](https://github.com/egovernments/health-campaign-services).

## Dependencies

### Infra Dependency

- [X] Postgres DB
- [X] Redis
- [X] Elasticsearch
- [X] Kafka
- [X] Consumer
- [X] Producer


## Running Locally

You can use docker-compose file to get started with these dependencies. Download docker-compose.yml from [here](../libraries/docker-compose.yml)

Use the following command to start containers

```
cd path/to/docker-compose.yml file

docker-compose up -d
```

To run it locally this service requires port forwarding of idgen service, MDMS service and enc service.

Directly run the application.
55 changes: 55 additions & 0 deletions core-services/individual/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
# Individual

### Individual Service
Individual registry is a Health Campaign Service that facilitates maintenance of an Individual registry on the DIGIT platform. The functionality is exposed via REST API.

### DB UML Diagram

<img width="668" alt="Screenshot 2023-03-29 at 2 41 00 PM" src="https://user-images.githubusercontent.com/123379163/228485868-e8b34236-8188-42ae-a24f-b97ec195a3aa.png">


### Service Dependencies
- Idgen Service

### Swagger API Contract
Link to the swagger API contract yaml and editor link like below

https://editor.swagger.io/?url=https://raw.githubusercontent.com/egovernments/health-campaign-services/v1.0.0/docs/health-api-specs/contracts/registries/individual.yml

### Service Details

#### API Details
BasePath `/individual/v1`

Individual service APIs - contains create, update, delete and search end point

a) POST `/individual/v1/_create` - Create Individual, This API is internally call from individual controller to create/add a new individual.

b) POST `/individual/v1/bulk/_create` - Create bulk Individual, This API is internally call from individual controller to create/add new individual in bulk.

c) POST `/individual/v1/_update` - Update Individual, This API is internally call from individual controller to update the details of an existing individual.

d) POST `/individual/v1/bulk/_update` - Update bulk Individual, This API is internally call from individual controller to update the details of existing individual in bulk.

e) POST `/individual/v1/_delete` - Delete Individual, This API is internally call from individual controller to soft delete details of an existing individual.

f) POST `/individual/v1/bulk/_delete` - Delete bulk Individual, This API is internally call from individual controller to soft delete details of an existing individual in bulk.

g) POST `/individual/v1/_search` - Search Individual, This API is internally call from individual controller to search existing individual.


### Kafka Consumers

- individual-consumer-bulk-create-topic
- individual-consumer-bulk-update-topic
- individual-consumer-bulk-delete-topic

### Kafka Producers

- save-individual-topic
- update-individual-topic
- delete-individual-topic

## Pre commit script

[commit-msg](https://gist.github.com/jayantp-egov/14f55deb344f1648503c6be7e580fa12)
125 changes: 125 additions & 0 deletions core-services/individual/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,125 @@
<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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.egov</groupId>
<artifactId>individual</artifactId>
<packaging>jar</packaging>
<name>individual</name>
<version>1.1.2</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.15-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.egov.common</groupId>
<artifactId>health-services-models</artifactId>
<version>1.0.13-SNAPSHOT</version>
<scope>compile</scope>
</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>

<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-core</artifactId>
<version>1.5.18</version>
</dependency>
<!-- Egov dependencies -->
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.egov</groupId>
<artifactId>enc-client</artifactId>
<version>2.0.4-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>org.egov.services</groupId>
<artifactId>tracer</artifactId>
</exclusion>
</exclusions>
</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>
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
package org.egov.individual;

public interface Constants {
String SET_INDIVIDUALS = "setIndividuals";
String VALIDATION_ERROR = "VALIDATION_ERROR";
String SYSTEM_GENERATED = "SYSTEM_GENERATED";
String GET_INDIVIDUALS = "getIndividuals";
String GET_SKILLS = "getSkills";
String GET_IDENTIFIERS = "getIdentifiers";
String GET_ADDRESS = "getAddress";
String GET_IDENTIFIER_TYPE = "getIdentifierType";
String GET_TYPE = "getType";
String GET_ID = "getId";
String INDIVIDUAL_CREATE_LOCALIZATION_CODE = "INDIVIDUAL_NOTIFICATION_ON_CREATE";
String INDIVIDUAL_UPDATE_LOCALIZATION_CODE = "INDIVIDUAL_NOTIFICATION_ON_UPDATE";
String INDIVIDUAL_NOTIFICATION_ENG_LOCALE_CODE = "en_IN";
String INDIVIDUAL_MODULE_CODE = "rainmaker-masters";
String INDIVIDUAL_LOCALIZATION_CODES_JSONPATH = "$.messages.*.code";
String INDIVIDUAL_LOCALIZATION_MSGS_JSONPATH = "$.messages.*.message";
String ORG_ADMIN_ROLE_CODE = "ORG_ADMIN";
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
package org.egov.individual;

import org.egov.tracer.config.TracerConfiguration;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cache.annotation.EnableCaching;
import org.springframework.context.annotation.Import;

@Import({ TracerConfiguration.class })
@SpringBootApplication
@EnableCaching
public class IndividualApplication {
public static void main(String[] args) throws Exception {
SpringApplication.run(IndividualApplication.class, args);
}
}
Loading