Pmidc upgrade dev

.gitignore

@@ -2,3 +2,28 @@
 frontend/micro-ui-internals/node_modules/*
 .idea
 index.lock
+*.bak
+
+# dependencies
+/node_modules
+/packages/lib/*
+/packages/egov-ui-kit
+/packages/egov-ui-framework
+/packages/pgr-citizen
+/packages/pgr-employee
+/packages/pt-citizen
+/packages/pt-employee
+/packages/egov-tradelicence
+/packages/egov-pt
+/packages/egov-workflow
+/packages/egov-hrms
+/packages/egov-mp
+/packages/egov-uc
+/packages/egov-noc
+
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+lerna-debug.log*
+
+

CODEOWNERS

@@ -1,16 +1,17 @@
-*  @gajendran-egov @sathishp-eGov
-*.yaml  @gajendran-egov @sathishp-eGov
+*  @gajendran-egov @sathishp-eGov @kavi-egov
+*.yaml  @gajendran-egov @sathishp-eGov @kavi-egov
 
-* business-services/ @sathishp-eGov @talele08 @kavi-egov @sirishrao-egov
-* core-services/ @sathishp-eGov @talele08 @kavi-egov @sirishrao-egov
-* municipal-services/ @sathishp-eGov @talele08 @kavi-egov @sirishrao-egov
-* frontend/ @sathishp-eGov @talele08 @kavi-egov @sirishrao-egov
-* edcr/ @pradeep
-* finance/ @elzan
+business-services/ @sathishp-eGov @talele08 @kavi-egov @sirishrao-egov @subhashini-egov @talele08 
+core-services/ @sathishp-eGov @talele08 @kavi-egov @sirishrao-egov @subhashini-egov @talele08 
+municipal-services/ @sathishp-eGov @talele08 @kavi-egov @sirishrao-egov @subhashini-egov @talele08 @kapil-eGov @AmanKumar-eGov
 
 ##Frontend
 frontend/micro-ui/  @sathishp-eGov @jagankumar-egov @saurabh-egov  @sirishrao-egov
 frontend/micro-ui-internals/ @sathishp-eGov @jagankumar-egov @saurabh-egov @sirishrao-egov
 frontend/mono-ui/ @sathishp-eGov @jagankumar-egov @sirishrao-egov
 
 
+##Frontend
+frontend/micro-ui/  @sathishp-eGov @jagankumar-egov @sirishrao-egov @subhashini-egov @talele08
+frontend/micro-ui-internals/ @sathishp-eGov @jagankumar-egov @sirishrao-egov @subhashini-egov @talele08
+frontend/mono-ui/ @sathishp-eGov @jagankumar-egov @sirishrao-egov @subhashini-egov @talele08

README.md

@@ -1,6 +1,6 @@
-# UPYOG (Urban Platform for deliverY of Online Governance)
-
-UPYOG is a set of Open APIs, services, and reference implementations, setup as a public good, to allow government entities, businesses, startups, and civil society to use a unique digital Infrastructure and build solutions for urban India at a large scale. It provides a set of open standards, specifications and documentation to create a level playing field and enable ecosystem players to innovate on the stack. As a public good, the platform is provided without profit or restriction to all members of society.
+# DIGIT Urban Stack 
+ 
+DIGIT is a set of Open APIs, services, and reference implementations, setup as a public good, to allow government entities, businesses, startups, and civil society to use a unique digital Infrastructure and build solutions for urban India at a large scale. It provides a set of open standards, specifications and documentation to create a level playing field and enable ecosystem players to innovate on the stack. As a public good, the platform is provided without profit or restriction to all members of society.
 
 UPYOG focuses on inclusion and is designed on the principle of enhancing both platform openness and choice for citizens. The platform uses open APIs and standards, creating a powerful framework to drive convergence across the multiple systems currently in use, and to lower the barrier to entry for locally-developed solutions. Keeping in mind that most Indians use the internet through their phones, we follow and advocate a “mobile-first” approach, while supporting multi-channel access to accommodate diverse needs and preferences.
 

build/build-config.yml

@@ -300,14 +300,13 @@ config:
         image-name: "internal-gateway"
         dockerfile: "build/maven/Dockerfile"
 
-  - name: "builds/upyog/core-services/egov-user-event"
+  - name: "builds/upyog/municipal-services/egov-user-event"
     build:
-      - work-dir: "core-services/egov-user-event"
+      - work-dir: "municipal-services/egov-user-event"
         image-name: "egov-user-event"
         dockerfile: "build/maven/Dockerfile"
-      - work-dir: "core-services/egov-user-event/src/main/resources/db"
-        image-name: "egov-user-event-db"
-        dockerfile: "build/maven/Dockerfile"       
+      - work-dir: "municipal-services/egov-user-event/src/main/resources/db"
+        image-name: "egov-user-event-db"       
 
   - name: "builds/upyog/core-services/pdf-service"
     build:
@@ -380,18 +379,31 @@ config:
       - work-dir: "core-services/libraries/tracer"
         image-name: "tracer"
 
-  - name: "builds/upyog/core-services/nlp-engine"
+  - name: "builds/digit-dev/core-services/libraries/digit-models"
+    build:
+      - work-dir: "core-services/libraries/digit-models"
+        image-name: "digit-models"
+
+  - name: "builds/digit-dev/core-services/nlp-engine"
     build:
       - work-dir: "core-services/nlp-engine"
         image-name: "nlp-engine"
-        dockerfile: "nlp-engine/Dockerfile"
+        dockerfile: "core-services/nlp-engine/Dockerfile"
 
   - name: "builds/upyog/core-services/xstate-chatbot"
     build:
       - work-dir: "core-services/xstate-chatbot/nodejs"
         image-name: "xstate-chatbot"
       - work-dir: "core-services/xstate-chatbot/nodejs/db"
         image-name: "xstate-chatbot-db"
+
+  - name: "builds/digit-dev/core-services/xstate-webchat"
+    build:
+      - work-dir: "core-services/xstate-webchat/nodejs"
+        image-name: "xstate-webchat"
+      - work-dir: "core-services/xstate-webchat/nodejs/db"
+        image-name: "xstate-webchat-db"
+
 
   - name: "builds/upyog/core-services/xstate-webchat"
     build:
@@ -616,14 +628,14 @@ config:
       - work-dir: "municipal-services/birth-death-services/src/main/resources/db"
         image-name: "birth-death-services-db"
 
-  - name: "builds/upyog/municipal-services/birth-registration"
+  - name: "builds/upyog/tutorials/backend-developer-guide/btr-services"
     build:
-      - work-dir: "municipal-services/birth-registration"
-        image-name: "birth-registration"
+      - work-dir: "tutorials/backend-developer-guide/btr-services"
+        image-name: "btr-services"
         dockerfile: "build/maven/Dockerfile"
-      - work-dir: "municipal-services/birth-registration/src/main/resources/db"
-        image-name: "birth-registration-db"
- 
+      - work-dir: "tutorials/backend-developer-guide/btr-services/src/main/resources/db"
+        image-name: "btr-services-db"
+
  # Utilities
 
   - name: "builds/upyog/utilities/egov-weekly-impact-notifier"

build/maven/Dockerfile

@@ -12,7 +12,7 @@ COPY build/maven/start.sh ./start.sh
 # RUN mvn -B dependency:go-offline
 
 COPY ${WORK_DIR}/src ./src
-RUN mvn -B -f /app/pom.xml package
+RUN mvn -B -f /app/pom.xml package -Dmaven.test.skip=true -DskipTests
 
 
 # Create runtime image

business-services/billing-service/pom.xml

@@ -24,9 +24,26 @@
 		<maven.version>3.3.9</maven.version>
 		<lombok.version>1.18.8</lombok.version>
 		<commons-lang-version>2.6</commons-lang-version>
+		<cache2k-version>1.2.0.Final</cache2k-version>
 	</properties>
 	<dependencies>
 		<dependency>
+      <groupId>org.cache2k</groupId>
+      <artifactId>cache2k-api</artifactId>
+      <version>${cache2k-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.cache2k</groupId>
+      <artifactId>cache2k-core</artifactId>
+      <version>${cache2k-version}</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.cache2k</groupId>
+      <artifactId>cache2k-spring</artifactId>
+      <version>${cache2k-version}</version>
+    </dependency>
+		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
 		</dependency>
@@ -52,6 +69,18 @@
 			<groupId>org.springframework.kafka</groupId>
 			<artifactId>spring-kafka</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.powermock</groupId>
+			<artifactId>powermock-api-mockito</artifactId>
+			<version>1.6.5</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.powermock</groupId>
+			<artifactId>powermock-module-junit4</artifactId>
+			<version>1.6.5</version>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-devtools</artifactId>

business-services/billing-service/src/main/java/org/egov/demand/config/ApplicationProperties.java

@@ -192,7 +192,20 @@ public class ApplicationProperties {
 
     @Value("${amendment.id.format.name}")
     private String amendmentIdFormatName;
-
+	
 	@Value("${statelevel.rolecode.excluded.list}")
 	private List<String> statelevelRolecodeExclusionList;
+
+    @Value("${egov.shortener.url}")
+    private String egovShortenerUrl;
+
+    @Value("${notification.url}")
+	private String notificationUrl;
+
+    @Value("${notification.sms.link}")
+	private String smsNotificationLink;
+
+    @Value("${egov.shortener.host}")
+   	private String shortenerHost;
+
 }