avatic/lcc_tool
avatic/lcc_tool
1
0
Fork 0
Code Issues 31 Pull requests 5 Projects Releases Packages Wiki Activity Actions

further sql fixes

Browse source
This commit is contained in:
Jan 2026-01-27 12:40:11 +01:00
parent b1d46c1057
commit e53f865210
5 changed files with 41 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/main/java/de/avatic/lcc/repositories/NodeRepository.java
View file

@ -412,7 +412,11 @@ public class NodeRepository {
(%s) <= ?
""", dialectProvider.getBooleanFalse(), haversineFormula);
return jdbcTemplate.query(query, new NodeMapper(), node.getGeoLat(), node.getGeoLng(), regionRadius);
return jdbcTemplate.query(query, new NodeMapper(),
node.getGeoLat(), // for COS(RADIANS(?))
node.getGeoLng(), // for COS(RADIANS(?) - RADIANS(geo_lng))
node.getGeoLat(), // for SIN(RADIANS(?))
regionRadius); // for <= ?
}
@ -422,7 +426,12 @@ public class NodeRepository {
(%s) <= ?
""", dialectProvider.getBooleanFalse(), haversineFormula);
return jdbcTemplate.query(query, new NodeMapper(), node.getId(), node.getGeoLat(), node.getGeoLng(), regionRadius);
return jdbcTemplate.query(query, new NodeMapper(),
node.getId(), // for id != ?
node.getGeoLat(), // for COS(RADIANS(?))
node.getGeoLng(), // for COS(RADIANS(?) - RADIANS(geo_lng))
node.getGeoLat(), // for SIN(RADIANS(?))
regionRadius); // for <= ?
}
@ -468,7 +477,7 @@ public class NodeRepository {
public Optional<Node> getByDestinationId(Integer id) {
String query = "SELECT node.* FROM node INNER JOIN premise_destination WHERE node.id = premise_destination.destination_node_id AND premise_destination.id = ?";
String query = "SELECT node.* FROM node INNER JOIN premise_destination ON node.id = premise_destination.destination_node_id WHERE premise_destination.id = ?";
var node = jdbcTemplate.query(query, new NodeMapper(), id);

2
src/main/java/de/avatic/lcc/repositories/NomenclatureRepository.java
View file

@ -23,7 +23,7 @@ public class NomenclatureRepository {
public List<String> searchHsCode(String search) {
String concatExpression = dialectProvider.buildConcat("?", "'%'");
String sql = String.format(
"SELECT hs_code FROM nomenclature WHERE hs_code LIKE %s %s",
"SELECT hs_code FROM nomenclature WHERE hs_code LIKE %s ORDER BY hs_code %s",
concatExpression,
dialectProvider.buildPaginationClause(10, 0)
);

18
src/main/java/de/avatic/lcc/repositories/bulk/BulkOperationRepository.java
View file

@ -37,10 +37,10 @@ public class BulkOperationRepository {
removeOld(operation.getUserId());
String sql = """
INSERT INTO bulk_operation (user_id, bulk_file_type, bulk_processing_type, state, file, validity_period_id)
String sql = String.format("""
INSERT INTO bulk_operation (user_id, bulk_file_type, bulk_processing_type, state, %s, validity_period_id)
VALUES (?, ?, ?, ?, ?, ?)
""";
""", dialectProvider.escapeIdentifier("file"));
GeneratedKeyHolder keyHolder = new GeneratedKeyHolder();
@ -158,11 +158,11 @@ public class BulkOperationRepository {
@Transactional
public Optional<BulkOperation> getOperationById(Integer id) {
String sql = """
SELECT id, user_id, bulk_file_type, bulk_processing_type, state, file, created_at, validity_period_id
String sql = String.format("""
SELECT id, user_id, bulk_file_type, bulk_processing_type, state, %s, created_at, validity_period_id
FROM bulk_operation
WHERE id = ?
""";
""", dialectProvider.escapeIdentifier("file"));
List<BulkOperation> results = jdbcTemplate.query(sql, new BulkOperationRowMapper(false), id);
@ -171,11 +171,11 @@ public class BulkOperationRepository {
@Transactional
public void update(BulkOperation op) {
String sql = """
String sql = String.format("""
UPDATE bulk_operation
SET user_id = ?, bulk_file_type = ?, state = ?, file = ?, validity_period_id = ?
SET user_id = ?, bulk_file_type = ?, state = ?, %s = ?, validity_period_id = ?
WHERE id = ?
""";
""", dialectProvider.escapeIdentifier("file"));
jdbcTemplate.update(sql,
op.getUserId(),

11
src/main/java/de/avatic/lcc/repositories/rates/ContainerRateRepository.java
View file

@ -251,15 +251,16 @@ public class ContainerRateRepository {
@Transactional
public boolean hasMainRun(Integer nodeId) {
String query = """
SELECT EXISTS(
SELECT CASE WHEN EXISTS(
SELECT 1 FROM container_rate
WHERE (from_node_id = ? OR to_node_id = ?)
WHERE (from_node_id = ? OR to_node_id = ?)
AND (container_rate_type = ? OR container_rate_type = ?)
)
) THEN 1 ELSE 0 END
""";
return Boolean.TRUE.equals(jdbcTemplate.queryForObject(query, Boolean.class,
nodeId, nodeId, TransportType.SEA.name(), TransportType.RAIL.name()));
Integer result = jdbcTemplate.queryForObject(query, Integer.class,
nodeId, nodeId, TransportType.SEA.name(), TransportType.RAIL.name());
return result != null && result > 0;
}
@Transactional

17
src/main/java/de/avatic/lcc/repositories/users/UserNodeRepository.java
View file

@ -49,6 +49,7 @@ public class UserNodeRepository {
queryBuilder.append(" AND is_deprecated = ").append(dialectProvider.getBooleanFalse());
}
queryBuilder.append(" ORDER BY id");
queryBuilder.append(" ").append(dialectProvider.buildPaginationClause(limit, 0));
Object[] paginationParams = dialectProvider.getPaginationParameters(limit, 0);
@ -145,11 +146,19 @@ public class UserNodeRepository {
@Transactional
public void checkOwner(List<Integer> userNodeIds, Integer userId) {
String query = """
SELECT id FROM sys_user_node WHERE id IN (?) AND user_id <> ?
""";
if (userNodeIds.isEmpty()) {
return;
}
var otherIds = jdbcTemplate.queryForList(query, Integer.class, userNodeIds, userId);
String placeholders = String.join(",", Collections.nCopies(userNodeIds.size(), "?"));
String query = """
SELECT id FROM sys_user_node WHERE id IN (""" + placeholders + ") AND user_id <> ?";
// Combine userNodeIds and userId into a single parameter array
List<Object> params = new ArrayList<>(userNodeIds);
params.add(userId);
var otherIds = jdbcTemplate.queryForList(query, Integer.class, params.toArray());
if(!otherIds.isEmpty()) {
throw new ForbiddenException("Access violation. Cannot open user nodes with ids = " + otherIds);