Bump spring-webflux from 5.0.6.RELEASE to 5.2.20.RELEASE in /admin/hotlist-service

.github/workflows/push_trigger.yml

@@ -126,7 +126,7 @@ jobs:
 
     - name: Publish the maven package
       run: |
-        cd admin && mvn deploy -DaltDeploymentRepository=ossrh::default::${{ secrets.OSSRH_SNAPSHOT_URL }} -s $GITHUB_WORKSPACE/settings.xml -f pom.xml
+        cd admin && mvn deploy -DaltDeploymentRepository=ossrh::default::${{ secrets.RELEASE_URL }} -s $GITHUB_WORKSPACE/settings.xml -f pom.xml
       env:
         GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}
         GPG_TTY: $(tty)

.github/workflows/release_changes.yml

@@ -27,6 +27,11 @@ jobs:
         echo "BRANCH_NAME=$(echo ${{ github.ref }} | sed -e 's,.*/\(.*\),\1,')" >> $GITHUB_ENV
         echo "GPG_TTY=$(tty)" >> $GITHUB_ENV
 
+    - name: update Branch name in badges
+      run: |
+        sed -i 's/branch=.*)]/branch=${{ env.BRANCH_NAME }}\)]/g'  README.md
+        sed -i 's/branch=.*\&/branch=${{ env.BRANCH_NAME }}\&/g'  README.md
+
     - name: Mannualy changing the pom versions
       run: find . -type f -name "*pom.xml" -print0 | xargs -0 sed -i "s/${{ github.event.inputs.snapshotTags }}/${{ github.event.inputs.releaseTags }}/g"
 
@@ -48,7 +53,7 @@ jobs:
       uses: peter-evans/create-pull-request@v3
       with:
         token: ${{ secrets.ACTION_PAT }}
-        commit-message: Updated Pom versions for release changes
+        commit-message: Release Bot Pre-release changes
         title: Release changes
         body: Automated PR for ${{ github.event.inputs.releaseTags }} release.
         branch: release-branch

.github/workflows/tag.yaml

@@ -0,0 +1,43 @@
+name: Tagging of repos
+
+env:
+  tag: v1.2.3
+
+on:
+  workflow_dispatch:
+    inputs:
+      tag:
+        description: 'Tag to be published'
+        required: true
+        default: 'v1.2.3'
+        type: string
+      body:
+        description: 'Release body message'
+        required: true
+        default: 'Changes in this Release'
+        type: string
+      pre-release:
+        description: 'Pre-release? True/False'
+        required: true
+        default: False
+        type: string
+
+jobs:
+  build:
+    name: Create Release
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+      - name: Create Release
+        id: create_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
+        with:
+          tag_name: ${{ github.event.inputs.tag }}
+          release_name: ${{ github.event.inputs.tag }}
+          body: |
+            ${{ github.event.inputs.body }}
+          draft: false
+          prerelease: ${{fromJSON(github.event.inputs.pre-release)}}

README.md

@@ -1,4 +1,4 @@
-[![Maven Package upon a push](https://github.com/mosip/admin-services/actions/workflows/push_trigger.yml/badge.svg?branch=develop)](https://github.com/mosip/admin-services/actions/workflows/push_trigger.yml)
+[![Maven Package upon a push](https://github.com/mosip/admin-services/actions/workflows/push_trigger.yml/badge.svg?branch=release-1.2.0.1)](https://github.com/mosip/admin-services/actions/workflows/push_trigger.yml)
 [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=mosip_admin-services&id=mosip_admin-services&metric=alert_status)](https://sonarcloud.io/dashboard?id=mosip_admin-services)
 
 

admin/admin-service/pom.xml

@@ -7,18 +7,18 @@
 	<parent>
 		<groupId>io.mosip.admin</groupId>
 		<artifactId>admin-parent</artifactId>
-		<version>1.2.0.1-SNAPSHOT</version>
+		<version>1.2.0.1-B1</version>
 	</parent>
 	<artifactId>admin-service</artifactId>
 	<name>admin-service</name>
-	<version>1.2.0.1-SNAPSHOT</version>
+	<version>1.2.0.1-B1</version>
 	<url>http://maven.apache.org</url>
 	<packaging>jar</packaging>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<spring-cloud-config.version>2.0.4.RELEASE</spring-cloud-config.version>
 		<springdoc.version>1.5.10</springdoc.version>
-		<kernel.version>1.2.0.1-SNAPSHOT</kernel.version>
+		<kernel.version>1.2.0.1-B1</kernel.version>
 	</properties>
 	<dependencies>
 		<dependency>

admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/batch/CustomLineMapper.java

@@ -7,10 +7,13 @@
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.util.Assert;
 
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
 import javax.validation.Validator;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
+import java.util.Set;
 
 public class CustomLineMapper <T> implements LineMapper<T>, InitializingBean {
 
@@ -41,6 +44,10 @@ public T mapLine(String line, int lineNumber) throws Exception {
                 throw new Exception("Invalid language code provided");
             }
         }
+        Set<ConstraintViolation<T>> violations = validator.validate(fieldSetMapper.mapFieldSet(tokenizer.tokenize(line)));
+	    if (!violations.isEmpty()) {
+	      throw new ConstraintViolationException(violations);
+	    }
 
         return fieldSetMapper.mapFieldSet(tokenizer.tokenize(line));
     }

admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/batch/JobResultListener.java

@@ -17,6 +17,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.validation.ConstraintViolationException;
+
 public class JobResultListener implements JobExecutionListener {
 
     private static final Logger logger = LoggerFactory.getLogger(JobResultListener.class);
@@ -58,9 +60,13 @@ public void afterJob(JobExecution jobExecution) {
             List<String> failures = new ArrayList<String>();
             jobExecution.getStepExecutions().forEach(step -> {
                 step.getFailureExceptions().forEach(failure -> {
-                    if (failure instanceof FlatFileParseException) {
+                	if (failure instanceof FlatFileParseException && failure.getCause() instanceof ConstraintViolationException) {
+                        failures.add("Line --> " + ((FlatFileParseException) failure).getLineNumber() +  " --> "+
+                                ((FlatFileParseException) failure).getCause().getMessage());
+                    }
+                    else if(failure instanceof FlatFileParseException){
                         failures.add("Line --> " + ((FlatFileParseException) failure).getLineNumber() +
-                                " --> Datatype mismatch / Failed to write into object");
+                                " --> Datatype mismatch/ Validation error / Failed to write into object");
                     } else
                         failures.add(failure.getCause() != null ? failure.getCause().getMessage() : failure.getMessage());
                 });

admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/BlocklistedWords.java

@@ -7,6 +7,7 @@
 import javax.persistence.Id;
 import javax.persistence.Table;
 
+import io.mosip.admin.validator.AlphabeticValidator;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -37,6 +38,7 @@ public class BlocklistedWords extends BaseEntity implements Serializable {
 	 */
 	@Id
 	@Column(name = "word", length = 128)
+	@AlphabeticValidator(message = "Blocklisted word can only contain Alphabets")
 	private String word;
 
 	/**

admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/ModuleDetail.java

@@ -5,8 +5,11 @@
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
+import javax.persistence.IdClass;
 import javax.persistence.Table;
 
+import io.mosip.admin.bulkdataupload.entity.id.CodeAndLanguageCodeID;
+import io.mosip.admin.bulkdataupload.entity.id.IdAndLanguageCodeID;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -18,6 +21,7 @@
 @AllArgsConstructor
 @Entity
 @Table(name = "module_detail", schema = "master")
+@IdClass(IdAndLanguageCodeID.class)
 public class ModuleDetail extends BaseEntity implements Serializable {
 
 	/**
@@ -29,6 +33,7 @@ public class ModuleDetail extends BaseEntity implements Serializable {
 	@Column(name = "id", nullable = false, length = 36)
 	private String id;
 
+	@Id
 	@Column(name = "lang_code", nullable = false, length = 3)
 	private String langCode;
 

admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/Template.java

@@ -71,7 +71,8 @@ public class Template extends BaseEntity implements Serializable {
 
 	@ManyToOne(fetch = FetchType.LAZY)
 	@JoinColumns({
-			@JoinColumn(name = "module_id", referencedColumnName = "id", insertable = false, updatable = false) })
+			@JoinColumn(name = "module_id", referencedColumnName = "id", insertable = false, updatable = false),
+			@JoinColumn(name = "lang_code", referencedColumnName = "lang_code", insertable = false, updatable = false) })
 	private ModuleDetail moduleDetail;
 
 	@ManyToOne(fetch = FetchType.LAZY)

admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/HolidayID.java

@@ -33,7 +33,5 @@ public class HolidayID implements Serializable {
 	@Column(name = "lang_code", nullable = false, length = 3)
 	private String langCode;
 
-	@Column(name = "holiday_name", nullable = false, length = 64)
-	private String holidayName;
 
 }

admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/service/impl/BulkDataUploadServiceImpl.java

@@ -14,6 +14,7 @@
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
 import javax.sql.DataSource;
+import javax.validation.Validator;
 
 import io.mosip.admin.bulkdataupload.batch.CustomLineMapper;
 import io.mosip.admin.bulkdataupload.batch.JobResultListener;
@@ -108,6 +109,9 @@ public class BulkDataUploadServiceImpl implements BulkDataService {
 
 	@Autowired
 	private RestTemplate restTemplate;
+
+	@Autowired
+	private Validator validator;
 
 	@Autowired
 	private BulkUploadTranscationRepository bulkTranscationRepo;
@@ -474,7 +478,7 @@ public void handleLine(String s) {
 		fieldSetMapper.setTargetType(clazz);
 		fieldSetMapper.setConversionService(customConversionService());
 
-		CustomLineMapper<Object> lineMapper = new CustomLineMapper<Object>(setupLanguages(), null);
+		CustomLineMapper<Object> lineMapper = new CustomLineMapper<Object>(setupLanguages(), validator);
 		lineMapper.setLineTokenizer(lineTokenizer);
 		lineMapper.setFieldSetMapper(fieldSetMapper);
 		flatFileItemReader.setLineMapper(lineMapper);

admin/admin-service/src/main/java/io/mosip/admin/validator/AlphabeticValidator.java

@@ -0,0 +1,27 @@
+package io.mosip.admin.validator;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import javax.validation.Constraint;
+import javax.validation.Payload;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.env.Environment;
+
+
+
+@Documented
+@Constraint(validatedBy = LanguageCharacterValidator.class)
+@Target({ ElementType.FIELD, ElementType.TYPE_USE, ElementType.PARAMETER })
+@Retention(RetentionPolicy.RUNTIME)
+public @interface AlphabeticValidator {
+	String message() default "Numbers and Special characters not allowed";
+
+	Class<?>[] groups() default {};
+
+	Class<? extends Payload>[] payload() default {};
+}

admin/admin-service/src/main/java/io/mosip/admin/validator/LanguageCharacterValidator.java

@@ -0,0 +1,33 @@
+package io.mosip.admin.validator;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+import javax.validation.ConstraintValidator;
+import javax.validation.ConstraintValidatorContext;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+@Component
+public class LanguageCharacterValidator  implements ConstraintValidator<AlphabeticValidator, String>  {
+	@Value("${mosip.kernel.masterdata.name.validate.regex:[^a-zA-Z]}")
+	private String allowedCharactersRegex ;
+
+	@Override
+	public boolean isValid(String value, ConstraintValidatorContext context) {
+		if(allowedCharactersRegex==null) {
+			/*         Note: An additional validation was getting triggered by doInvoke() method of 
+			 * 		 RepositoryListItemWriter class with allowedCharactersRegex equal to null
+			 *               which is not desired. This if clause is being used to escape that additional 
+			 *               validation step.
+			 */
+			return true;
+		}
+		if (null != value && !value.isEmpty()) {
+			Pattern p = Pattern.compile(allowedCharactersRegex, Pattern.CASE_INSENSITIVE);
+			Matcher m = p.matcher(value.trim());
+			return !(m.find());
+		}
+		return true;
+	}
+}

admin/admin-service/src/main/resources/application-local1.properties

@@ -363,4 +363,6 @@ mosip.admin.masterdata.service.version=v1
 mosip.admin.keymanager.service.version=v1
 mosip.admin.base.url=https://dev.mosip.net
 mosip.service.end-points=/**/masterdata/**,/**/keymanager/**
-auth.allowed.urls=http://localhost:5000/
+auth.allowed.urls=http://localhost:5000/
+mosip.iam.certs_endpoint=http://localhost:5000/auth/realms/mosip/protocol/openid-connect/certs
+mosip.kernel.masterdata.name.validate.regex=[^A-Za-z]

admin/admin-service/src/test/java/io/mosip/admin/controller/test/AdminControllerTest.java

@@ -111,7 +111,7 @@ public void t002lostRidTest() throws Exception {
 		AdminDataUtil.checkResponse(
 				(mockMvc.perform(MockMvcRequestBuilders.post("/lostRid").contentType(MediaType.APPLICATION_JSON)
 						.content(mapper.writeValueAsString(searchInfoReq))).andReturn()),
-				"ADMN-LRID-001");
+				null);
 
 	}
 

admin/admin-service/src/test/java/io/mosip/admin/controller/test/BulkDataUploadControllerTest.java

@@ -124,6 +124,29 @@ public void t001getTranscationDetailTest() throws Exception {
 
 	}
 
+	@Test
+	@WithUserDetails("global-admin")
+	public void BlocklistedWordsConstraintvalidationNegativeTest() throws Exception {
+		String content="word,description,langCode,isActive,isDeleted\r\n" +
+				"Some Random Words,Test,eng,TRUE,FALSE\r\n";
+		MockMultipartFile blocklisted_words = new MockMultipartFile("data", "filename.csv", "multipart/form-data", content.getBytes());
+		AdminDataUtil.checkResponse(
+				mockMvc.perform(MockMvcRequestBuilders.multipart("/bulkupload").file(blocklisted_words).param("tableName","blocklisted_words").param("operation","insert").param("category","masterdata")).andReturn(),
+				"ADM-BLK-007");
+
+	}
+
+
+	@Test
+	@WithUserDetails("global-admin")
+	public void BlocklistedWordsConstraintvalidationPositiveTest() throws Exception {
+	String content="word,description,langCode,isActive\r\n" +
+			"SomeWord,DDD,eng,TRUE";
+	MockMultipartFile gender = new MockMultipartFile("files", "gender.csv", "multipart/form-data", content.getBytes());
+	AdminDataUtil.checkResponse(
+	mockMvc.perform(MockMvcRequestBuilders.multipart("/bulkupload").file(gender).param("tableName","blocklisted_words").param("operation","insert").param("category","masterdata")).andReturn(),null);
+	}
+
 	@Test
 	@WithUserDetails("global-admin")
 	public void t001getTranscationDetailTestFail() throws Exception {

admin/admin-service/src/test/java/io/mosip/admin/util/AdminDataUtil.java

@@ -15,21 +15,27 @@ public static void checkResponse(MvcResult rst, String expectedCode) {
 		try {
 			ObjectMapper mapper = new ObjectMapper();
 			if (rst.getResponse().getContentAsString().isEmpty() && rst.getResponse().getStatus() == 404) {
-				assertEquals(404, rst.getResponse().getStatus());
+				assertEquals(404,rst.getResponse().getStatus());
 
 			} else {
 				Map m = mapper.readValue(rst.getResponse().getContentAsString(), Map.class);
-				assertEquals(200, rst.getResponse().getStatus());
-				if (m.containsKey("errors") && null != m.get("errors")) {
-//					assertEquals(((List<Map<String, String>>) m.get("errors")).get(0).get("errorCode"), actualCode);
-					assertEquals(expectedCode, ((List<Map<String, String>>) m.get("errors")).get(0).get("errorCode"));
-				}
+				assertEquals(200,rst.getResponse().getStatus());
+				assertEquals(expectedCode, getErrorCode(m));
 			}
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
 
 	}
+
+	private static String getErrorCode(Map map){
+		if(map.containsKey("errors") && null != map.get("errors")){
+			List<Map<String ,String>> data=(List<Map<String, String>>) map.get("errors");
+			return data.isEmpty()?null:data.get(0).get("errorCode");
+		}
+		return null;
+	} 
+
 	public static void checkErrorResponse(MvcResult rst, String s) {
 		assertEquals(rst.getResponse().getStatus(), 500);
 	}

admin/admin-service/src/test/resources/application-test.properties

@@ -456,3 +456,4 @@ mosip.admin.base.url=https://dev.mosip.net
 mosip.service.end-points=/**/masterdata/**,/**/keymanager/**
 auth.allowed.urls=http://localhost:5000/
 
+mosip.kernel.masterdata.name.validate.regex=[^A-Za-z]