Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,22 @@ public CompletableFuture<E> findByFieldNames(Map<String, Object> values) {
});
}

@Override
public CompletableFuture<List<E>> findManyByFieldName(String name, Object value) {
return this.findManyByFieldNames(Map.of(name, value));
}

@Override
public CompletableFuture<List<E>> findManyByFieldNames(Map<String, Object> values) {
return CompletableFuture.supplyAsync(() -> {
Bson filter = Filters.empty();
for (Map.Entry<String, Object> entry : values.entrySet()) {
filter = Filters.and(filter, Filters.eq(entry.getKey(), entry.getValue()));
}
return database.find(filter).into(new ArrayList<>());
});
}

private ID getId(E entity) {
return ReflectionUtils.getId(entity, idClass);
}
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/de/varilx/database/repository/Repository.java
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,8 @@ public interface Repository<ENTITY, ID> {

CompletableFuture<ENTITY> findByFieldNames(Map<String, Object> values);

CompletableFuture<List<ENTITY>> findManyByFieldName(String name, Object value);

CompletableFuture<List<ENTITY>> findManyByFieldNames(Map<String, Object> values);

}
33 changes: 30 additions & 3 deletions src/main/java/de/varilx/database/sql/repository/SQLRepository.java
Original file line number Diff line number Diff line change
Expand Up @@ -145,9 +145,7 @@ public CompletableFuture<E> findByFieldNames(Map<String, Object> entries) {
session.beginTransaction();
String hql = "FROM " + entityClass.getName() + (entries.size() > 0 ? " WHERE " : "");

hql += entries.entrySet().stream().map(entry -> {
return entry.getKey() + " = :" +entry.getKey();
}).collect(Collectors.joining(" AND "));
hql += entries.keySet().stream().map(object -> object + " = :" + object).collect(Collectors.joining(" AND "));


Query<E> query = session.createQuery(hql, entityClass);
Expand All @@ -163,4 +161,33 @@ public CompletableFuture<E> findByFieldNames(Map<String, Object> entries) {
}
});
}

@Override
public CompletableFuture<List<E>> findManyByFieldName(String name, Object value) {
return this.findManyByFieldNames(Map.of(name, value));
}

@Override
public CompletableFuture<List<E>> findManyByFieldNames(Map<String, Object> entries) {
return CompletableFuture.supplyAsync(() -> {
try (Session session = this.sessionFactory.openSession()) {
session.beginTransaction();
String hql = "FROM " + entityClass.getName() + (entries.size() > 0 ? " WHERE " : "");

hql += entries.keySet().stream().map(object -> object + " = :" + object).collect(Collectors.joining(" AND "));


Query<E> query = session.createQuery(hql, entityClass);

for (int i = 0; i < entries.size(); i++) {
query.setParameter(entries.keySet().stream().toList().get(i), entries.values().stream().toList().get(i));
}

List<E> result = query
.getResultList();
session.getTransaction().commit();
return result;
}
});
}
}
2 changes: 1 addition & 1 deletion src/main/java/de/varilx/utils/language/LanguageUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public Component getMessage(String path, TagResolver... args) {
BaseAPI.get().getLogger().warning(path + " was not found in lang/" + BaseAPI.get().getLanguage() + ".yml");
return Component.text("Path: " + path + " not found!");
}
return MiniMessage.miniMessage().deserialize("<!i><gray>" + raw, args);
return MiniMessage.miniMessage().deserialize("<!i><gray>" + raw, initializeLanguageAndResolvers(args).toArray(TagResolver[]::new));
}

public List<Component> getMessageList(String path, TagResolver... args) {
Expand Down
Loading