Godfather-Bots/autoresponder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Рефакторинг

Browse Source
This commit is contained in:
Mark Struchkov 2019-05-16 00:24:08 +03:00
parent f8f8a51d79
commit 9c821ee1fb
2 changed files with 36 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
src/main/java/org/sadtech/autoresponder/Autoresponder.java
View File

@ -3,6 +3,7 @@ package org.sadtech.autoresponder;
import org.sadtech.autoresponder.compare.UnitPriorityComparator; import org.sadtech.autoresponder.compare.UnitPriorityComparator;
import org.sadtech.autoresponder.entity.Unit; import org.sadtech.autoresponder.entity.Unit;
import org.sadtech.autoresponder.entity.UnitPointer; import org.sadtech.autoresponder.entity.UnitPointer;
import org.sadtech.autoresponder.exception.NotFoundUnitException;
import org.sadtech.autoresponder.service.UnitPointerService; import org.sadtech.autoresponder.service.UnitPointerService;
import org.sadtech.autoresponder.util.Parser; import org.sadtech.autoresponder.util.Parser;
import org.slf4j.Logger; import org.slf4j.Logger;
@ -22,14 +23,11 @@ public class Autoresponder {
private static final Logger log = LoggerFactory.getLogger(Autoresponder.class); private static final Logger log = LoggerFactory.getLogger(Autoresponder.class);
private static final UnitPriorityComparator UNIT_PRIORITY_COMPARATOR = new UnitPriorityComparator(); private static final UnitPriorityComparator UNIT_PRIORITY_COMPARATOR = new UnitPriorityComparator();
/* private final Set<Unit> startUnits;
Начальные unit, по которым происходит поиск, если пользователь только обратился или закончил сценарий.
*/
private final Set<Unit> menuUnits;
private final UnitPointerService unitPointerService; private final UnitPointerService unitPointerService;
public Autoresponder(UnitPointerService unitPointerService, Set<Unit> menuUnits) { public Autoresponder(UnitPointerService unitPointerService, Set<Unit> startUnits) {
this.menuUnits = menuUnits; this.startUnits = startUnits;
this.unitPointerService = unitPointerService; this.unitPointerService = unitPointerService;
} }
@ -43,57 +41,46 @@ public class Autoresponder {
public Unit answer(Integer personId, String message) { public Unit answer(Integer personId, String message) {
UnitPointer unitPointer = checkAndAddPerson(personId); UnitPointer unitPointer = checkAndAddPerson(personId);
Unit unit; Unit unit;
if (unitPointer.getUnit() == null) { if (unitPointer.getUnit() == null || unitPointer.getUnit().getNextUnits() == null) {
unit = nextUnit(menuUnits, message); // выбирает unit из menuUnits, если пользователь обращается впервые unit = nextUnit(startUnits, message); // выбирает unit из startUnits, если пользователь обращается впервые
} else { } else {
if (unitPointer.getUnit().getNextUnits() == null) { unit = nextUnit(unitPointer.getUnit().getNextUnits(), message);
unit = nextUnit(menuUnits, message); // если пользователь закончил сценарий, то выбирает следующий юнит из menuUnits
} else {
unit = nextUnit(unitPointer.getUnit().getNextUnits(), message);
}
}
if (unit != null) {
unitPointerService.edit(personId, unit);
} }
unitPointerService.edit(personId, unit);
return unit; return unit;
} }
private UnitPointer checkAndAddPerson(Integer idPerson) { private Unit nextUnit(Set<Unit> nextUnits, String message) {
Optional<Unit> unit = nextUnits.stream()
.filter(nextUnit -> nextUnit.getPattern() != null)
.filter(nextUnit -> patternReg(nextUnit, message))
.max(UNIT_PRIORITY_COMPARATOR);
if (!unit.isPresent()) {
unit = nextUnits.stream()
.filter(nextUnit -> textPercentageMatch(nextUnit, Parser.parse(message)) >= nextUnit.getMatchThreshold())
.max(UNIT_PRIORITY_COMPARATOR);
}
if (!unit.isPresent()) {
unit = nextUnits.stream()
.filter(nextUnit -> (nextUnit.getPattern() == null && nextUnit.getKeyWords() == null))
.max(UNIT_PRIORITY_COMPARATOR);
}
return unit.orElseThrow(NotFoundUnitException::new);
}
private UnitPointer checkAndAddPerson(Integer personId) {
UnitPointer unitPointer; UnitPointer unitPointer;
if (unitPointerService.check(idPerson)) { if (unitPointerService.check(personId)) {
unitPointer = unitPointerService.getByEntityId(idPerson); unitPointer = unitPointerService.getByEntityId(personId);
} else { } else {
unitPointer = new UnitPointer(idPerson); unitPointer = new UnitPointer(personId);
unitPointerService.add(unitPointer); unitPointerService.add(unitPointer);
} }
return unitPointer; return unitPointer;
} }
private Unit nextUnit(Set<Unit> nextUnits, String message) {
if (nextUnits.size() > 0) {
Optional<Unit> patternUnits = nextUnits.stream()
.filter(nextUnit -> nextUnit.getPattern() != null)
.filter(nextUnit -> patternReg(nextUnit, message))
.max(UNIT_PRIORITY_COMPARATOR);
if (!patternUnits.isPresent()) {
patternUnits = nextUnits.stream()
.filter(nextUnit -> textPercentageMatch(nextUnit, Parser.parse(message)) >= nextUnit.getMatchThreshold())
.max(UNIT_PRIORITY_COMPARATOR);
}
if (!patternUnits.isPresent()) {
patternUnits = nextUnits.stream()
.filter(nextUnit -> (nextUnit.getPattern() == null && nextUnit.getKeyWords() == null))
.max(UNIT_PRIORITY_COMPARATOR);
}
return patternUnits.orElse(null);
} else {
return null;
}
}
private boolean patternReg(Unit unit, String message) { private boolean patternReg(Unit unit, String message) {
Pattern pattern = unit.getPattern(); Pattern pattern = unit.getPattern();
Matcher m = pattern.matcher(message); Matcher m = pattern.matcher(message);

4
src/main/java/org/sadtech/autoresponder/exception/NotFoundUnitException.java Normal file
View File

@ -0,0 +1,4 @@
package org.sadtech.autoresponder.exception;
public class NotFoundUnitException extends RuntimeException {
}