* Добавил билдер для Unit-а счетов и Автопроверке оплаты счета, а так же убрал лишние поля

* Исправил написание слова Builder в AnswerCheck
* Удалил лишний Unit
* Прочие архитектурные изменения
This commit is contained in:
Mark Struchkov 2019-06-15 15:15:11 +03:00
parent 8cf244bb1c
commit c24239c6fe
23 changed files with 311 additions and 157 deletions

View File

@ -38,10 +38,6 @@ public class BoxAnswer {
return keyboard; return keyboard;
} }
public void setKeyboard(KeyBoard keyboard) {
this.keyboard = keyboard;
}
public GeoCoordinate getCoordinates() { public GeoCoordinate getCoordinates() {
return coordinates; return coordinates;
} }
@ -50,10 +46,6 @@ public class BoxAnswer {
return stickerId; return stickerId;
} }
public void setStickerId(Integer stickerId) {
this.stickerId = stickerId;
}
public BoxAnswer prototype() { public BoxAnswer prototype() {
return new BoxAnswer(this); return new BoxAnswer(this);
} }

View File

@ -1,41 +1,9 @@
package org.sadtech.bot.core.domain.content; package org.sadtech.bot.core.domain.content;
import java.util.Objects; public class BoardComment extends Comment {
public class BoardComment extends Content {
private Integer topicId;
public BoardComment() { public BoardComment() {
type = ContentType.BOARD_COMMENT; type = ContentType.BOARD_COMMENT;
} }
public Integer getTopicId() {
return topicId;
}
public void setTopicId(Integer topicId) {
this.topicId = topicId;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (!(o instanceof BoardComment)) return false;
if (!super.equals(o)) return false;
BoardComment that = (BoardComment) o;
return Objects.equals(topicId, that.topicId);
}
@Override
public int hashCode() {
return Objects.hash(super.hashCode(), topicId);
}
@Override
public String toString() {
return "BoardComment{" +
"topicId=" + topicId +
"} " + super.toString();
}
} }

View File

@ -0,0 +1,30 @@
package org.sadtech.bot.core.domain.content;
import java.util.Objects;
public abstract class Comment extends Message {
private Integer contentId;
public Integer getContentId() {
return contentId;
}
public void setContentId(Integer contentId) {
this.contentId = contentId;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (!(o instanceof Comment)) return false;
if (!super.equals(o)) return false;
Comment that = (Comment) o;
return Objects.equals(contentId, that.contentId);
}
@Override
public int hashCode() {
return Objects.hash(super.hashCode(), contentId);
}
}

View File

@ -2,6 +2,6 @@ package org.sadtech.bot.core.domain.content;
public enum ContentType { public enum ContentType {
MAIL, BOARD_COMMENT MAIL, BOARD_COMMENT, EMPTY
} }

View File

@ -2,7 +2,11 @@ package org.sadtech.bot.core.domain.content;
import org.sadtech.bot.core.exception.AppBotException; import org.sadtech.bot.core.exception.AppBotException;
public class EmptyContent extends Content { public class EmptyMessage extends Message {
public EmptyMessage() {
type = ContentType.EMPTY;
}
@Override @Override
public String getMessage() { public String getMessage() {
@ -11,6 +15,6 @@ public class EmptyContent extends Content {
@Override @Override
public void setMessage(String message) { public void setMessage(String message) {
throw new AppBotException(0, "EmptyContent no setMessage"); throw new AppBotException(0, "EmptyMessage no setMessage");
} }
} }

View File

@ -5,11 +5,10 @@ import org.sadtech.bot.core.domain.content.attachment.Attachment;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
public class Mail extends Content { public class Mail extends Message {
private List<Attachment> attachments; private List<Attachment> attachments;
public Mail() { public Mail() {
type = ContentType.MAIL; type = ContentType.MAIL;
} }
@ -32,6 +31,7 @@ public class Mail extends Content {
this.attachments = attachments; this.attachments = attachments;
} }
@Override @Override
public boolean equals(Object o) { public boolean equals(Object o) {
if (this == o) return true; if (this == o) return true;
@ -50,6 +50,7 @@ public class Mail extends Content {
public String toString() { public String toString() {
return "Mail{" + return "Mail{" +
"attachments=" + attachments + "attachments=" + attachments +
"} " + super.toString(); ", type=" + type +
'}';
} }
} }

View File

@ -3,7 +3,7 @@ package org.sadtech.bot.core.domain.content;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.Objects; import java.util.Objects;
public abstract class Content { public abstract class Message {
private Integer id; private Integer id;
protected ContentType type; protected ContentType type;
@ -11,11 +11,11 @@ public abstract class Content {
private Integer personId; private Integer personId;
private String message; private String message;
public Content() { public Message() {
} }
public Content(Content source) { public Message(Message source) {
this.personId = source.getPersonId(); this.personId = source.getPersonId();
this.message = source.getMessage(); this.message = source.getMessage();
this.createDate = source.getCreateDate(); this.createDate = source.getCreateDate();
@ -66,13 +66,13 @@ public abstract class Content {
@Override @Override
public boolean equals(Object o) { public boolean equals(Object o) {
if (this == o) return true; if (this == o) return true;
if (!(o instanceof Content)) return false; if (!(o instanceof Message)) return false;
Content content = (Content) o; Message message = (Message) o;
return Objects.equals(id, content.id) && return Objects.equals(id, message.id) &&
type == content.type && type == message.type &&
Objects.equals(createDate, content.createDate) && Objects.equals(createDate, message.createDate) &&
Objects.equals(personId, content.personId) && Objects.equals(personId, message.personId) &&
Objects.equals(message, content.message); Objects.equals(this.message, message.message);
} }
@Override @Override
@ -82,7 +82,7 @@ public abstract class Content {
@Override @Override
public String toString() { public String toString() {
return "Content{" + return "Message{" +
"id=" + id + "id=" + id +
", type=" + type + ", type=" + type +
", createDate=" + createDate + ", createDate=" + createDate +

View File

@ -0,0 +1,7 @@
package org.sadtech.bot.core.domain.keyboard;
public enum ButtonType {
TEXT, ACCOUNT
}

View File

@ -2,80 +2,38 @@ package org.sadtech.bot.core.domain.keyboard;
import java.util.Objects; import java.util.Objects;
public class KeyBoardButton { public abstract class KeyBoardButton {
private String payload; protected String payload;
private String label; protected ButtonType type = ButtonType.TEXT;
private ButtonColor color = ButtonColor.DEFAULT;
private KeyBoardButton() {
}
public String getPayload() { public String getPayload() {
return payload; return payload;
} }
public String getLabel() { public void setPayload(String payload) {
return label; this.payload = payload;
} }
public ButtonColor getColor() { public ButtonType getType() {
return color; return type;
} }
public static Builder builder() { public void setType(ButtonType type) {
return new KeyBoardButton().new Builder(); this.type = type;
}
public class Builder {
private Builder() {
}
public Builder color(ButtonColor color) {
KeyBoardButton.this.color = color;
return this;
}
public Builder label(String label) {
KeyBoardButton.this.label = label;
return this;
}
public Builder payload(String payload) {
KeyBoardButton.this.payload = payload;
return this;
}
public KeyBoardButton build() {
return KeyBoardButton.this;
}
} }
@Override @Override
public boolean equals(Object o) { public boolean equals(Object o) {
if (this == o) return true; if (this == o) return true;
if (!(o instanceof KeyBoardButton)) return false; if (!(o instanceof KeyBoardButton)) return false;
KeyBoardButton button = (KeyBoardButton) o; KeyBoardButton that = (KeyBoardButton) o;
return Objects.equals(payload, button.payload) && return Objects.equals(payload, that.payload) &&
Objects.equals(label, button.label) && type == that.type;
color == button.color;
} }
@Override @Override
public int hashCode() { public int hashCode() {
return Objects.hash(payload, label, color); return Objects.hash(payload, type);
}
@Override
public String toString() {
return "KeyBoardButton{" +
"payload='" + payload + '\'' +
", label='" + label + '\'' +
", color=" + color +
'}';
} }
} }

View File

@ -0,0 +1,75 @@
package org.sadtech.bot.core.domain.keyboard.button;
import org.sadtech.bot.core.domain.keyboard.ButtonType;
import org.sadtech.bot.core.domain.keyboard.KeyBoardButton;
import java.util.Objects;
public class KeyBoardButtonAccount extends KeyBoardButton {
private Integer amount;
private Integer accountId;
private String description;
private KeyBoardButtonAccount() {
type = ButtonType.ACCOUNT;
}
public Integer getAmount() {
return amount;
}
public String getDescription() {
return description;
}
public Integer getAccountId() {
return accountId;
}
public static Builder builder() {
return new KeyBoardButtonAccount().new Builder();
}
public class Builder {
private Builder() {
}
public Builder amount(Integer amount) {
KeyBoardButtonAccount.this.amount = amount;
return this;
}
public Builder description(String description) {
KeyBoardButtonAccount.this.description = description;
return this;
}
public Builder accountId(Integer accountId) {
KeyBoardButtonAccount.this.accountId = accountId;
return this;
}
public KeyBoardButtonAccount build() {
return KeyBoardButtonAccount.this;
}
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (!(o instanceof KeyBoardButtonAccount)) return false;
if (!super.equals(o)) return false;
KeyBoardButtonAccount that = (KeyBoardButtonAccount) o;
return Objects.equals(amount, that.amount) &&
Objects.equals(description, that.description);
}
@Override
public int hashCode() {
return Objects.hash(super.hashCode(), amount, description);
}
}

View File

@ -0,0 +1,78 @@
package org.sadtech.bot.core.domain.keyboard.button;
import org.sadtech.bot.core.domain.keyboard.ButtonColor;
import org.sadtech.bot.core.domain.keyboard.ButtonType;
import org.sadtech.bot.core.domain.keyboard.KeyBoardButton;
import java.util.Objects;
public class KeyBoardButtonText extends KeyBoardButton {
private String label;
private ButtonColor color = ButtonColor.DEFAULT;
public KeyBoardButtonText() {
type = ButtonType.TEXT;
}
public ButtonColor getColor() {
return color;
}
public String getLabel() {
return label;
}
public static Builder builder() {
return new KeyBoardButtonText().new Builder();
}
public class Builder {
private Builder() {
}
public Builder label(String label) {
KeyBoardButtonText.this.label = label;
return this;
}
public Builder color(ButtonColor color) {
KeyBoardButtonText.this.color = color;
return this;
}
public Builder payload(String payload) {
KeyBoardButtonText.this.payload = payload;
return this;
}
public KeyBoardButtonText build() {
return KeyBoardButtonText.this;
}
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (!(o instanceof KeyBoardButtonText)) return false;
if (!super.equals(o)) return false;
KeyBoardButtonText that = (KeyBoardButtonText) o;
return Objects.equals(label, that.label) &&
color == that.color;
}
@Override
public int hashCode() {
return Objects.hash(super.hashCode(), label, color);
}
@Override
public String toString() {
return "KeyBoardButtonText{" +
"label='" + label + '\'' +
", color=" + color +
'}';
}
}

View File

@ -5,7 +5,7 @@ import java.util.Objects;
public class Account { public class Account {
private Integer id; private Integer id;
private Double totalSum; private Integer totalSum;
private Integer belongsPersonId; private Integer belongsPersonId;
private Integer extinguishedPersonId; private Integer extinguishedPersonId;
private String description; private String description;
@ -19,11 +19,11 @@ public class Account {
this.id = id; this.id = id;
} }
public Double getTotalSum() { public Integer getTotalSum() {
return totalSum; return totalSum;
} }
public void setTotalSum(Double totalSum) { public void setTotalSum(Integer totalSum) {
this.totalSum = totalSum; this.totalSum = totalSum;
} }

View File

@ -0,0 +1,9 @@
package org.sadtech.bot.core.exception;
public class TimerSettingExceprion extends AppBotException {
public TimerSettingExceprion(String message) {
super(54, message);
}
}

View File

@ -1,11 +1,11 @@
package org.sadtech.bot.core.repository; package org.sadtech.bot.core.repository;
import org.sadtech.bot.core.domain.content.Content; import org.sadtech.bot.core.domain.content.Message;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.List; import java.util.List;
public interface ContentRepository<T extends Content> { public interface ContentRepository<T extends Message> {
Integer add(T content); Integer add(T content);

View File

@ -43,6 +43,6 @@ public class AccountRepositoryMap implements AccountRepository {
} }
private boolean check(Integer id) { private boolean check(Integer id) {
return saveMap.containsKey(id); return !saveMap.containsKey(id);
} }
} }

View File

@ -6,7 +6,7 @@ public interface AccountService {
Integer add(Account account); Integer add(Account account);
Boolean pay(Integer accountId, Integer extinguishedPersonId, Double sum); Boolean pay(Integer accountId, Integer extinguishedPersonId, Integer sum);
Boolean paymentVerification(Integer accountId); Boolean paymentVerification(Integer accountId);

View File

@ -1,11 +1,11 @@
package org.sadtech.bot.core.service; package org.sadtech.bot.core.service;
import org.sadtech.bot.core.domain.content.Content; import org.sadtech.bot.core.domain.content.Message;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.List; import java.util.List;
public interface ContentService<T extends Content> { public interface ContentService<T extends Message> {
void add(T event); void add(T event);

View File

@ -1,9 +1,9 @@
package org.sadtech.bot.core.service; package org.sadtech.bot.core.service;
import org.sadtech.bot.core.domain.content.Content; import org.sadtech.bot.core.domain.content.Message;
@FunctionalInterface @FunctionalInterface
public interface Filter<T extends Content> { public interface Filter<T extends Message> {
void processing(T content); void processing(T content);

View File

@ -21,7 +21,7 @@ public class AccountServiceImpl implements AccountService {
} }
@Override @Override
public Boolean pay(Integer accountId, Integer extinguishedPersonId, Double sum) { public Boolean pay(Integer accountId, Integer extinguishedPersonId, Integer sum) {
Account account = accountRepository.findById(accountId); Account account = accountRepository.findById(accountId);
if (validStatus(account.getAccountStatus())) { if (validStatus(account.getAccountStatus())) {
if (account.getTotalSum().equals(sum)) { if (account.getTotalSum().equals(sum)) {

View File

@ -0,0 +1,26 @@
package org.sadtech.bot.core.service.sender;
import org.sadtech.bot.core.domain.BoxAnswer;
import org.sadtech.bot.core.domain.content.Comment;
import org.sadtech.bot.core.domain.content.Message;
public class SendBox {
private SendBox() {
}
public static void sent(Message message, BoxAnswer boxAnswer, Sent sent) {
switch (message.getType()) {
case BOARD_COMMENT:
sent.send(((Comment) message).getContentId(), message.getPersonId(), boxAnswer);
break;
case MAIL:
sent.send(message.getPersonId(), boxAnswer);
break;
default:
sent.send(message.getPersonId(), boxAnswer);
}
}
}

View File

@ -1,27 +0,0 @@
package org.sadtech.bot.core.service.sender;
import org.sadtech.bot.core.domain.BoxAnswer;
import org.sadtech.bot.core.domain.content.BoardComment;
import org.sadtech.bot.core.domain.content.Content;
import org.sadtech.bot.core.exception.MailSendException;
public class SenderBox {
private SenderBox() {
throw new IllegalStateException("Utility Class");
}
public static void sent(Sent sent, Content content, BoxAnswer boxAnswer) {
switch (content.getType()) {
case MAIL:
sent.send(content.getPersonId(), boxAnswer);
break;
case BOARD_COMMENT:
sent.send(((BoardComment) content).getTopicId(), content.getPersonId(), boxAnswer);
break;
default:
throw new MailSendException();
}
}
}

View File

@ -1,6 +1,6 @@
package org.sadtech.bot.core.utils; package org.sadtech.bot.core.utils;
import org.sadtech.bot.core.domain.content.EmptyContent; import org.sadtech.bot.core.domain.content.EmptyMessage;
public class Contents { public class Contents {
@ -8,7 +8,7 @@ public class Contents {
throw new IllegalStateException("Utility class"); throw new IllegalStateException("Utility class");
} }
public static final EmptyContent EMPTY_CONTENT = new EmptyContent(); public static final EmptyMessage EMPTY_CONTENT = new EmptyMessage();
} }

View File

@ -4,6 +4,7 @@ import org.sadtech.bot.core.domain.keyboard.ButtonColor;
import org.sadtech.bot.core.domain.keyboard.KeyBoard; import org.sadtech.bot.core.domain.keyboard.KeyBoard;
import org.sadtech.bot.core.domain.keyboard.KeyBoardButton; import org.sadtech.bot.core.domain.keyboard.KeyBoardButton;
import org.sadtech.bot.core.domain.keyboard.KeyBoardLine; import org.sadtech.bot.core.domain.keyboard.KeyBoardLine;
import org.sadtech.bot.core.domain.keyboard.button.KeyBoardButtonText;
import java.util.List; import java.util.List;
@ -14,8 +15,8 @@ public class KeyBoards {
} }
public static KeyBoard keyBoardYesNo() { public static KeyBoard keyBoardYesNo() {
KeyBoardButton yesButton = KeyBoardButton.builder().color(ButtonColor.POSITIVE).label("Да").payload("{\"button\": \"yes\"}").build(); KeyBoardButton yesButton = KeyBoardButtonText.builder().color(ButtonColor.POSITIVE).label("Да").payload("{\"button\": \"yes\"}").build();
KeyBoardButton noButton = KeyBoardButton.builder().color(ButtonColor.NEGATIVE).label("Нет").payload("{\"button\": \"no\"}").build(); KeyBoardButton noButton = KeyBoardButtonText.builder().color(ButtonColor.NEGATIVE).label("Нет").payload("{\"button\": \"no\"}").build();
KeyBoardLine keyBoardLine = KeyBoardLine.builder().buttonKeyBoard(yesButton).buttonKeyBoard(noButton).build(); KeyBoardLine keyBoardLine = KeyBoardLine.builder().buttonKeyBoard(yesButton).buttonKeyBoard(noButton).build();
return KeyBoard.builder().lineKeyBoard(keyBoardLine).oneTime(true).build(); return KeyBoard.builder().lineKeyBoard(keyBoardLine).oneTime(true).build();
} }
@ -23,12 +24,39 @@ public class KeyBoards {
public static KeyBoard verticalMenuString(List<String> labelButtons) { public static KeyBoard verticalMenuString(List<String> labelButtons) {
KeyBoard.Builder keyBoard = KeyBoard.builder().oneTime(true); KeyBoard.Builder keyBoard = KeyBoard.builder().oneTime(true);
for (String labelButton : labelButtons) { for (String labelButton : labelButtons) {
KeyBoardButton keyBoardButton = KeyBoardButton.builder().label(labelButton).payload("{\"button\": \"" + labelButton + "\"}").build(); KeyBoardButton keyBoardButton = KeyBoardButtonText.builder().label(labelButton).payload("{\"button\": \"" + labelButton + "\"}").build();
keyBoard.lineKeyBoard(KeyBoardLine.builder().buttonKeyBoard(keyBoardButton).build()); keyBoard.lineKeyBoard(KeyBoardLine.builder().buttonKeyBoard(keyBoardButton).build());
} }
return keyBoard.build(); return keyBoard.build();
} }
public static KeyBoard verticalMenuString(String... labelButton) {
KeyBoard.Builder keyBoard = KeyBoard.builder().oneTime(true);
for (String label : labelButton) {
KeyBoardButton keyBoardButton = KeyBoardButtonText.builder().label(label).payload("{\"button\": \"" + label + "\"}").build();
keyBoard.lineKeyBoard(KeyBoardLine.builder().buttonKeyBoard(keyBoardButton).build());
}
return keyBoard.build();
}
public static KeyBoard verticalDuoMenuString(String... labelButton) {
KeyBoard.Builder keyBoard = KeyBoard.builder().oneTime(true);
boolean flag = true;
KeyBoardLine.Builder keyBoardLine = KeyBoardLine.builder();
for (String label : labelButton) {
if (flag) {
keyBoardLine.buttonKeyBoard(KeyBoardButtonText.builder().label(label).build());
flag = false;
} else {
keyBoardLine.buttonKeyBoard(KeyBoardButtonText.builder().label(label).build());
keyBoard.lineKeyBoard(keyBoardLine.build());
keyBoardLine = KeyBoardLine.builder();
flag = true;
}
}
return keyBoard.build();
}
public static KeyBoard verticalMenuButton(List<KeyBoardButton> keyBoardButtons) { public static KeyBoard verticalMenuButton(List<KeyBoardButton> keyBoardButtons) {
KeyBoard.Builder keyBoard = KeyBoard.builder().oneTime(true); KeyBoard.Builder keyBoard = KeyBoard.builder().oneTime(true);
for (KeyBoardButton keyBoardButton : keyBoardButtons) { for (KeyBoardButton keyBoardButton : keyBoardButtons) {
@ -36,4 +64,9 @@ public class KeyBoards {
} }
return keyBoard.build(); return keyBoard.build();
} }
public static KeyBoard singelton(KeyBoardButton keyBoardButton) {
KeyBoardLine line = KeyBoardLine.builder().buttonKeyBoard(keyBoardButton).build();
return KeyBoard.builder().lineKeyBoard(line).build();
}
} }