Skip to content

[MOSIP-28461] Cherry picked changes from release branch to develop #1171

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

Open
balaji-alluru wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

[MOSIP-28461] Cherry picked changes from release branch to develop #1171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
399c3e4
Fixed test case failure MOSIP-27529
Jul 14, 2023
2e38d17
MOSIP-28461 MOSIP-28369
Jul 14, 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
11 changes: 5 additions & 6 deletions ...rvice/src/main/java/io/mosip/kernel/masterdata/service/impl/ValidDocumentServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import jakarta.transaction.Transactional;

import io.mosip.kernel.masterdata.dto.response.FilterResult;
import io.mosip.kernel.masterdata.utils.*;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cache.annotation.CacheEvict;
Expand Down Expand Up @@ -61,12 +62,6 @@
import io.mosip.kernel.masterdata.repository.DocumentTypeRepository;
import io.mosip.kernel.masterdata.repository.ValidDocumentRepository;
import io.mosip.kernel.masterdata.service.ValidDocumentService;
import io.mosip.kernel.masterdata.utils.MapperUtils;
import io.mosip.kernel.masterdata.utils.MasterDataFilterHelper;
import io.mosip.kernel.masterdata.utils.MasterdataSearchHelper;
import io.mosip.kernel.masterdata.utils.MetaDataUtils;
import io.mosip.kernel.masterdata.utils.OptionalFilter;
import io.mosip.kernel.masterdata.utils.PageUtils;
import io.mosip.kernel.masterdata.validator.FilterColumnValidator;
import io.mosip.kernel.masterdata.validator.FilterTypeEnum;
import io.mosip.kernel.masterdata.validator.FilterTypeValidator;
Expand Down Expand Up @@ -113,6 +108,9 @@ public class ValidDocumentServiceImpl implements ValidDocumentService {

@Autowired
private FilterTypeValidator filterTypeValidator;

@Autowired
private LanguageUtils languageUtils;

/*
* (non-Javadoc)
Expand All @@ -127,6 +125,7 @@ public ValidDocumentID createValidDocument(ValidDocumentDto document) {

ValidDocument validDocument = MetaDataUtils.setCreateMetaData(document, ValidDocument.class);
validDocument.setIsActive(true);
validDocument.setLangCode(languageUtils.getDefaultLanguage()); //setting lang-code, as its required to be non-null for pre-reg (<=1.2.0.1)
try {
validDocument = documentRepository.create(validDocument);
} catch (DataAccessLayerException | DataAccessException e) {
Expand Down
2 changes: 1 addition & 1 deletion ...rnel-syncdata-service/src/main/java/io/mosip/kernel/syncdata/SyncDataBootApplication.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
@ComponentScan( value = {"io.mosip.kernel.syncdata.*", "${mosip.auth.adapter.impl.basepackage}",
"io.mosip.kernel.core", "io.mosip.kernel.crypto", "io.mosip.kernel.clientcrypto.service.impl",
"io.mosip.kernel.keymanagerservice.service", "io.mosip.kernel.keymanagerservice.util",
"io.mosip.kernel.keymanagerservice.helper", "io.mosip.kernel.keymanager",
"io.mosip.kernel.keymanagerservice.helper", "io.mosip.kernel.keymanager.hsm.impl",
"io.mosip.kernel.cryptomanager.util", "io.mosip.kernel.partnercertservice.helper",
"io.mosip.kernel.partnercertservice.service", "io.mosip.kernel.websub.api.client",
"io.mosip.kernel.keygenerator.bouncycastle", "io.mosip.kernel.websub.api.config",
Expand Down
4 changes: 4 additions & 0 deletions ...ata-service/src/main/java/io/mosip/kernel/syncdata/repository/TemplateTypeRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@ public interface TemplateTypeRepository extends JpaRepository<TemplateType, Stri
@Cacheable(cacheNames = "initial-sync", key = "'template_type'", condition = "#a0.getYear() <= 1970")
@Query("FROM TemplateType WHERE (createdDateTime BETWEEN ?1 AND ?2) OR (updatedDateTime BETWEEN ?1 AND ?2) OR (deletedDateTime BETWEEN ?1 AND ?2)")
List<TemplateType> findAllLatestCreatedUpdateDeleted(LocalDateTime lastUpdated, LocalDateTime currentTimeStamp);

@Cacheable(cacheNames = "initial-sync", key = "'template_type'", condition = "#a0.getYear() <= 1970")
@Query(value = "select * from master.template_type WHERE (code IN (select distinct template_typ_code from master.template where module_id=?3)) AND ((cr_dtimes between ?1 AND ?2) OR (upd_dtimes between ?1 AND ?2) OR (del_dtimes between ?1 AND ?2))", nativeQuery = true)
List<TemplateType> findAllLatestCreatedUpdateDeletedTemplateTypeCode(LocalDateTime lastUpdated, LocalDateTime currentTimeStamp, String regclientModuleId);

@Cacheable(cacheNames = "delta-sync", key = "'template_type'")
@Query(value = "select new io.mosip.kernel.syncdata.dto.EntityDtimes(max(aam.createdDateTime), max(aam.updatedDateTime), max(aam.deletedDateTime)) from TemplateType aam ")
Expand Down
2 changes: 1 addition & 1 deletion ...nel-syncdata-service/src/test/java/io/mosip/kernel/syncdata/test/TestBootApplication.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"io.mosip.kernel.core", "io.mosip.kernel.crypto",
"io.mosip.kernel.signature.service","io.mosip.kernel.clientcrypto.service.impl",
"io.mosip.kernel.keymanagerservice.service", "io.mosip.kernel.keymanagerservice.util",
"io.mosip.kernel.keymanagerservice.helper", "io.mosip.kernel.keymanager",
"io.mosip.kernel.keymanagerservice.helper", "io.mosip.kernel.keymanager.hsm.impl",
"io.mosip.kernel.cryptomanager.util", "io.mosip.kernel.partnercertservice.helper",
"io.mosip.kernel.partnercertservice.service", "io.mosip.kernel.websub.api.client",
"io.mosip.kernel.keygenerator.bouncycastle"})
Expand Down
2 changes: 1 addition & 1 deletion db_scripts/mosip_master/ddl/master-valid_document.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
CREATE TABLE master.valid_document(
doctyp_code character varying(36) NOT NULL,
doccat_code character varying(36) NOT NULL,
lang_code character varying(3),
lang_code character varying(3) NOT NULL,
is_active boolean NOT NULL,
cr_by character varying(256) NOT NULL,
cr_dtimes timestamp NOT NULL,
Expand Down
Loading