micord/ervu-lkrp-ul
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SUPPORT-8411: comment for test 2

Browse source
This commit is contained in:
gulnaz 2024-09-11 13:11:02 +03:00
parent 580204e565
commit 0f8a2a4a4b
4 changed files with 68 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

2
backend/src/main/java/ervu/KafkaProducerConfig.java
View file

@ -17,7 +17,7 @@ import org.springframework.kafka.core.ProducerFactory;
/**
* @author Alexandr Shalaginov
*/
@Configuration
//@Configuration
public class KafkaProducerConfig {
@Value("${kafka.send.url}")
private String kafkaUrl;

34
backend/src/main/java/ervu/dao/classifier/ClassifierAttributeDaoImpl.java
View file

@ -8,8 +8,8 @@ import org.jooq.DSLContext;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Repository;
import static ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.Tables.RECORD_ATTRIBUTES;
import static ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.ClassifierAttributes.CLASSIFIER_ATTRIBUTES;
//import static ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.Tables.RECORD_ATTRIBUTES;
//import static ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.ClassifierAttributes.CLASSIFIER_ATTRIBUTES;
/**
* @author Artyom Hackimullin
@ -21,25 +21,25 @@ public class ClassifierAttributeDaoImpl implements ClassifierAttributeDao {
private DSLContext dsl;
public void save(ClassifierAttributeModel[] classifierAttributeModels) {
var queries = Arrays.stream(classifierAttributeModels).map(attribute -> {
var uid = UUID.fromString(attribute.getUid());
return dsl.insertInto(CLASSIFIER_ATTRIBUTES)
.set(CLASSIFIER_ATTRIBUTES.CLASSIFIER_ATTRIBUTE_ID, uid)
.set(CLASSIFIER_ATTRIBUTES.ATTRIBUTE_NAME, attribute.getName())
.onConflict(CLASSIFIER_ATTRIBUTES.CLASSIFIER_ATTRIBUTE_ID)
.doUpdate()
.set(CLASSIFIER_ATTRIBUTES.ATTRIBUTE_NAME, attribute.getName());
}).toList();
dsl.batch(queries).execute();
// var queries = Arrays.stream(classifierAttributeModels).map(attribute -> {
// var uid = UUID.fromString(attribute.getUid());
// return dsl.insertInto(CLASSIFIER_ATTRIBUTES)
// .set(CLASSIFIER_ATTRIBUTES.CLASSIFIER_ATTRIBUTE_ID, uid)
// .set(CLASSIFIER_ATTRIBUTES.ATTRIBUTE_NAME, attribute.getName())
// .onConflict(CLASSIFIER_ATTRIBUTES.CLASSIFIER_ATTRIBUTE_ID)
// .doUpdate()
// .set(CLASSIFIER_ATTRIBUTES.ATTRIBUTE_NAME, attribute.getName());
// }).toList();
// dsl.batch(queries).execute();
}
@Override
public void deleteIfNotExistRecords() {
dsl.deleteFrom(CLASSIFIER_ATTRIBUTES).whereNotExists(
dsl.selectOne()
.from(RECORD_ATTRIBUTES)
.where(RECORD_ATTRIBUTES.ATTRIBUTE_ID.eq(CLASSIFIER_ATTRIBUTES.CLASSIFIER_ATTRIBUTE_ID)))
.execute();
// dsl.deleteFrom(CLASSIFIER_ATTRIBUTES).whereNotExists(
// dsl.selectOne()
// .from(RECORD_ATTRIBUTES)
// .where(RECORD_ATTRIBUTES.ATTRIBUTE_ID.eq(CLASSIFIER_ATTRIBUTES.CLASSIFIER_ATTRIBUTE_ID)))
// .execute();
}
}

94
backend/src/main/java/ervu/dao/classifier/RecordAttributesDaoImpl.java
View file

@ -8,8 +8,8 @@ import org.jooq.DSLContext;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Repository;
import static ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.ClassifierAttributes.CLASSIFIER_ATTRIBUTES;
import static ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.RecordAttributes.RECORD_ATTRIBUTES;
//import static ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.ClassifierAttributes.CLASSIFIER_ATTRIBUTES;
//import static ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.RecordAttributes.RECORD_ATTRIBUTES;
/**
@ -23,61 +23,63 @@ public class RecordAttributesDaoImpl implements RecordAttributesDao {
@Override
public void save(RecordModel[] recordModels, String version) {
var queries = Arrays.stream(recordModels)
.flatMap(it -> Arrays.stream(it.getAttributeValues())
.map(attribute -> {
var recordUid = UUID.fromString(it.getUid());
var attributeUid = UUID.fromString(attribute.getAttributeUid());
var value = attribute.getValue();
return dsl.insertInto(RECORD_ATTRIBUTES,
RECORD_ATTRIBUTES.RECORD_ID,
RECORD_ATTRIBUTES.ATTRIBUTE_ID,
RECORD_ATTRIBUTES.ATTRIBUTE_VALUE,
RECORD_ATTRIBUTES.VERSION
)
.values(recordUid, attributeUid, value, version)
.onConflict(RECORD_ATTRIBUTES.RECORD_ID, RECORD_ATTRIBUTES.ATTRIBUTE_ID)
.doUpdate()
.set(RECORD_ATTRIBUTES.ATTRIBUTE_VALUE, value)
.set(RECORD_ATTRIBUTES.VERSION, version)
.where(RECORD_ATTRIBUTES.RECORD_ID.eq(recordUid)
.and(RECORD_ATTRIBUTES.ATTRIBUTE_ID.eq(attributeUid)));
}))
.toList();
dsl.batch(queries).execute();
// var queries = Arrays.stream(recordModels)
// .flatMap(it -> Arrays.stream(it.getAttributeValues())
// .map(attribute -> {
// var recordUid = UUID.fromString(it.getUid());
// var attributeUid = UUID.fromString(attribute.getAttributeUid());
// var value = attribute.getValue();
//
// return dsl.insertInto(RECORD_ATTRIBUTES,
// RECORD_ATTRIBUTES.RECORD_ID,
// RECORD_ATTRIBUTES.ATTRIBUTE_ID,
// RECORD_ATTRIBUTES.ATTRIBUTE_VALUE,
// RECORD_ATTRIBUTES.VERSION
// )
// .values(recordUid, attributeUid, value, version)
// .onConflict(RECORD_ATTRIBUTES.RECORD_ID, RECORD_ATTRIBUTES.ATTRIBUTE_ID)
// .doUpdate()
// .set(RECORD_ATTRIBUTES.ATTRIBUTE_VALUE, value)
// .set(RECORD_ATTRIBUTES.VERSION, version)
// .where(RECORD_ATTRIBUTES.RECORD_ID.eq(recordUid)
// .and(RECORD_ATTRIBUTES.ATTRIBUTE_ID.eq(attributeUid)));
// }))
// .toList();
//
// dsl.batch(queries).execute();
}
@Override
public String fetchVersion() {
return dsl.select(RECORD_ATTRIBUTES.VERSION)
.from(RECORD_ATTRIBUTES)
.limit(1)
.fetchOptional(RECORD_ATTRIBUTES.VERSION)
.orElse("0");
// return dsl.select(RECORD_ATTRIBUTES.VERSION)
// .from(RECORD_ATTRIBUTES)
// .limit(1)
// .fetchOptional(RECORD_ATTRIBUTES.VERSION)
// .orElse("0");
return "0";
}
@Override
public String fetchTitleByLeg(String leg) {
return dsl.select(RECORD_ATTRIBUTES.ATTRIBUTE_VALUE)
.from(RECORD_ATTRIBUTES)
.join(CLASSIFIER_ATTRIBUTES)
.on(RECORD_ATTRIBUTES.ATTRIBUTE_ID.eq(CLASSIFIER_ATTRIBUTES.CLASSIFIER_ATTRIBUTE_ID))
.where(CLASSIFIER_ATTRIBUTES.ATTRIBUTE_NAME.eq("title")
.and(RECORD_ATTRIBUTES.RECORD_ID.eq(
dsl.select(RECORD_ATTRIBUTES.RECORD_ID)
.from(RECORD_ATTRIBUTES)
.where(RECORD_ATTRIBUTES.ATTRIBUTE_VALUE.equal(leg))
.fetchOneInto(UUID.class)))
)
.fetchOneInto(String.class);
// return dsl.select(RECORD_ATTRIBUTES.ATTRIBUTE_VALUE)
// .from(RECORD_ATTRIBUTES)
// .join(CLASSIFIER_ATTRIBUTES)
// .on(RECORD_ATTRIBUTES.ATTRIBUTE_ID.eq(CLASSIFIER_ATTRIBUTES.CLASSIFIER_ATTRIBUTE_ID))
// .where(CLASSIFIER_ATTRIBUTES.ATTRIBUTE_NAME.eq("title")
// .and(RECORD_ATTRIBUTES.RECORD_ID.eq(
// dsl.select(RECORD_ATTRIBUTES.RECORD_ID)
// .from(RECORD_ATTRIBUTES)
// .where(RECORD_ATTRIBUTES.ATTRIBUTE_VALUE.equal(leg))
// .fetchOneInto(UUID.class)))
// )
// .fetchOneInto(String.class);
return "";
}
@Override
public void deleteAllByVersion(String version) {
dsl.deleteFrom(RECORD_ATTRIBUTES)
.where(RECORD_ATTRIBUTES.VERSION.eq(version))
.execute();
// dsl.deleteFrom(RECORD_ATTRIBUTES)
// .where(RECORD_ATTRIBUTES.VERSION.eq(version))
// .execute();
}
}

3
backend/src/main/java/ervu/service/grid/impl/JournalInMemoryStaticGridLoadService.java
View file

@ -42,6 +42,7 @@ public class JournalInMemoryStaticGridLoadService implements
@Override
public List<JournalDto> loadData() {
//TODO получить данные из БД, объединить с данными из ЕРВУ
JournalFileDataRequest journalFileDataRequest = initJournalFileDataRequest();
try {
@ -58,7 +59,7 @@ public class JournalInMemoryStaticGridLoadService implements
}
}
//todo раскоментить после тестирования
//TODO раскоментить после тестирования
private JournalFileDataRequest initJournalFileDataRequest() {
// Optional<Authentication> authentication = Optional.ofNullable(
// SecurityContextHolder.getContext().getAuthentication());