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

Поправил баги у сабскрайберов, переименовал методы евентсервиса

Browse Source
This commit is contained in:
Mark Struchkov 2019-08-01 23:41:19 +03:00
parent 7b7fb629fa
commit 9207713665
11 changed files with 46 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/java/org/sadtech/vkbot/core/distribution/EventDistributor.java
View File

@ -1,41 +1,32 @@
package org.sadtech.vkbot.core.distribution;
import com.google.gson.JsonObject;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.sadtech.vkbot.core.distribution.subscriber.AbstractBasketSubscribe;
import org.sadtech.vkbot.core.service.RawEventService;
import java.util.Optional;
import java.util.Set;
import java.util.concurrent.atomic.AtomicBoolean;
@Slf4j
@RequiredArgsConstructor
public class EventDistributor implements Runnable {
private final RawEventService rawEventService;
private final Set<AbstractBasketSubscribe> basketSubscribes;
public EventDistributor(RawEventService rawEventService, Set<AbstractBasketSubscribe> basketSubscribes) {
this.rawEventService = rawEventService;
this.basketSubscribes = basketSubscribes;
log.info("EventDistributor инициализирован");
}
private final Set<AbstractBasketSubscribe<JsonObject, ?>> basketSubscribes;
@Override
public void run() {
while (true) {
Optional.ofNullable(rawEventService.getJsonObjects())
Optional.ofNullable(rawEventService.getNewEvent())
.ifPresent(events -> events.forEach(this::goNextSubscribe));
}
}
private boolean goNextSubscribe(JsonObject object) {
AtomicBoolean flag = new AtomicBoolean(false);
private void goNextSubscribe(JsonObject object) {
basketSubscribes.stream()
.filter(basketSubscribe -> basketSubscribe.check(object))
.forEach(basketSubscribe -> {
basketSubscribe.update(object);
flag.set(true);
});
return flag.get();
.forEach(basketSubscribe -> basketSubscribe.update(object));
}
}

4
src/main/java/org/sadtech/vkbot/core/distribution/AbstractBasketSubscribe.java → src/main/java/org/sadtech/vkbot/core/distribution/subscriber/AbstractBasketSubscribe.java
View File

@ -1,4 +1,4 @@
package org.sadtech.vkbot.core.distribution;
package org.sadtech.vkbot.core.distribution.subscriber;
import org.sadtech.vkbot.core.convert.Convert;
@ -15,7 +15,7 @@ public abstract class AbstractBasketSubscribe<S, C> {
convert = (object) -> (C) object;
}
protected abstract boolean check(S object);
public abstract boolean check(S object);
public void update(S object) {
C newObject = convert.converting(object);

4
src/main/java/org/sadtech/vkbot/core/distribution/AccountSubscribe.java → src/main/java/org/sadtech/vkbot/core/distribution/subscriber/AccountSubscribe.java
View File

@ -1,4 +1,4 @@
package org.sadtech.vkbot.core.distribution;
package org.sadtech.vkbot.core.distribution.subscriber;
import com.vk.api.sdk.objects.messages.Message;
import com.vk.api.sdk.objects.messages.MessageAttachmentType;
@ -23,7 +23,7 @@ public class AccountSubscribe extends AbstractBasketSubscribe<Message, Message>
}
@Override
protected boolean check(Message userMessage) {
public boolean check(Message userMessage) {
return userMessage.getAttachments().size() > 0
&& MessageAttachmentType.LINK.equals(userMessage.getAttachments().get(0).getType())
&& "Payment awaiting acceptance".equals(userMessage.getAttachments().get(0).getLink().getCaption());

4
src/main/java/org/sadtech/vkbot/core/distribution/BoardCommentSubscribe.java → src/main/java/org/sadtech/vkbot/core/distribution/subscriber/BoardCommentSubscribe.java
View File

@ -1,4 +1,4 @@
package org.sadtech.vkbot.core.distribution;
package org.sadtech.vkbot.core.distribution.subscriber;
import com.google.gson.Gson;
import com.google.gson.JsonObject;
@ -53,7 +53,7 @@ public class BoardCommentSubscribe extends AbstractBasketSubscribe<JsonObject, T
}
@Override
protected boolean check(JsonObject object) {
public boolean check(JsonObject object) {
String type = object.get("type").getAsString();
return "board_post_new".equals(type);
}

4
src/main/java/org/sadtech/vkbot/core/distribution/MailSubscriber.java → src/main/java/org/sadtech/vkbot/core/distribution/subscriber/MailSubscriber.java
View File

@ -1,4 +1,4 @@
package org.sadtech.vkbot.core.distribution;
package org.sadtech.vkbot.core.distribution.subscriber;
import com.google.gson.Gson;
import com.google.gson.JsonObject;
@ -22,7 +22,7 @@ public class MailSubscriber extends AbstractBasketSubscribe<JsonObject, Message>
}
@Override
protected boolean check(JsonObject object) {
public boolean check(JsonObject object) {
String type = object.get("type").getAsString();
return "message_new".equals(type);
}

2
src/main/java/org/sadtech/vkbot/core/repository/RawEventRepository.java
View File

@ -15,6 +15,6 @@ public interface RawEventRepository {
void cleanAll();
Set<JsonObject> getEventQueue();
Set<JsonObject> findNewEvent();
}

26
src/main/java/org/sadtech/vkbot/core/repository/impl/RawEventRepositoryQueue.java
View File

@ -1,26 +0,0 @@
//package org.sadtech.vkbot.core.repository.impl;
//
//import com.google.gson.JsonObject;
//import org.sadtech.vkbot.core.repository.RawEventRepository;
//
//import java.util.Queue;
//import java.util.concurrent.ConcurrentLinkedQueue;
//
//public class RawEventRepositoryQueue implements RawEventRepository {
//
// private final Queue<JsonObject> jsonObjects = new ConcurrentLinkedQueue<>();
//
// @Override
// public void add(JsonObject jsonObject) {
// jsonObjects.offer(jsonObject);
// }
//
// @Override
// public void cleanAll() {
// jsonObjects.clear();
// }
//
// public Set<JsonObject> getEventQueue() {
// return jsonObjects;
// }
//}

26
src/main/java/org/sadtech/vkbot/core/repository/impl/RawEventRepositorySet.java Normal file
View File

@ -0,0 +1,26 @@
package org.sadtech.vkbot.core.repository.impl;
import com.google.gson.JsonObject;
import org.sadtech.vkbot.core.repository.RawEventRepository;
import java.util.HashSet;
import java.util.Set;
public class RawEventRepositorySet implements RawEventRepository {
private final Set<JsonObject> jsonObjects = new HashSet<>();
@Override
public void add(JsonObject jsonObject) {
jsonObjects.add(jsonObject);
}
@Override
public void cleanAll() {
jsonObjects.clear();
}
public Set<JsonObject> findNewEvent() {
return jsonObjects;
}
}

2
src/main/java/org/sadtech/vkbot/core/repository/impl/jpa/RawEventRepositoryJpaImpl.java
View File

@ -38,7 +38,7 @@ public class RawEventRepositoryJpaImpl implements RawEventRepository {
}
@Override
public Set<JsonObject> getEventQueue() {
public Set<JsonObject> findNewEvent() {
if (addFlag) {
List<JsonObjectId> allEvent = rawEventRepositoryJpa.findAll();
rawEventRepositoryJpa.deleteAll(allEvent);

2
src/main/java/org/sadtech/vkbot/core/service/RawEventService.java
View File

@ -15,6 +15,6 @@ public interface RawEventService {
void add(JsonObject jsonObject);
Set<JsonObject> getJsonObjects();
Set<JsonObject> getNewEvent();
}

4
src/main/java/org/sadtech/vkbot/core/service/impl/RawEventServiceImpl.java
View File

@ -27,8 +27,8 @@ public class RawEventServiceImpl implements RawEventService {
}
@Override
public Set<JsonObject> getJsonObjects() {
return rawEventRepository.getEventQueue();
public Set<JsonObject> getNewEvent() {
return rawEventRepository.findNewEvent();
}
}