bvn13
/
JIrcBot
mirror of https://github.com/bvn13/JIrcBot.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixed wrong corrections

pull/2/head
Vyacheslav N. Boyko 2018-02-06 00:49:00 +03:00
parent 40fd72f305
commit 20e89d624a
1 changed files with 1 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/main/java/ru/bvn13/jircbot/database/services/GrammarCorrectionService.java
View File

@ -34,7 +34,7 @@ public class GrammarCorrectionService {
jdbcTemplate.query("" +
"SELECT ? as message, g.word, g.correction " +
"FROM public.grammar_correction AS g " +
"WHERE ? ~ g.word", new Object[]{ message, message },
"WHERE ? ~ concat('(\\A|\\s)', g.word, '(\\Z|\\s)')", new Object[]{ message, message },
row -> {
result.add(row.getString("correction"));
});
@ -45,36 +45,6 @@ public class GrammarCorrectionService {
return result;
}
public GrammarCorrection getLastCorrection(String word) {
JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
List<GrammarCorrection> result = jdbcTemplate.query("" +
"SELECT gc.id, gc.dtcreated, gc.dtupdated, gc.word, gc.correction, gc.author " +
"FROM " +
" (SELECT gc.word, MAX(gc.dtupdated) AS dtupdated " +
" FROM grammar_correction AS gc " +
" WHERE word ~ ?) AS tmax " +
"INNER JOIN grammar_correction AS gc " +
"ON gc.word = tmax.word AND gc.dtupdated = tmax.dtupdated " +
"ORDER BY gc.dtupdated DESC",
new Object[]{word},
(rs, rsNum) -> new GrammarCorrection(
rs.getLong("id"),
rs.getDate("dtcreated"),
rs.getDate("dtupdated"),
rs.getString("word"),
rs.getString("correction"),
rs.getString("author")
));
if (result.size() > 0) {
return result.get(0);
}
return null;
}
public void saveGrammarCorrection(String word, String correction, String author) {
GrammarCorrection gc = grammarCorrectionRepository.findFirstByWordAndCorrection(word, correction);
if (gc == null) {