Merge pull request #209 from whiskels/T-35_proxy

whiskels · web-flow · commit 849f354e890a · 2023-07-18T17:11:37.000+03:00
T-35: batch processing of debt data
diff --git a/src/main/java/com/whiskels/notifier/slack/SlackPayload.java b/src/main/java/com/whiskels/notifier/slack/SlackPayload.java
@@ -8,5 +8,5 @@
 @Getter
 public class SlackPayload {
     private final String url;
-    private final Payload payload;
+    private final Payload data;
 }
diff --git a/src/main/java/com/whiskels/notifier/slack/SlackWebHookExecutor.java b/src/main/java/com/whiskels/notifier/slack/SlackWebHookExecutor.java
@@ -4,6 +4,7 @@
 import com.whiskels.notifier.slack.reporter.SlackReporter;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Component;
 
 import java.io.IOException;
@@ -14,13 +15,16 @@
 public class SlackWebHookExecutor {
     private final Slack slack = Slack.getInstance();
 
-    public void execute(SlackPayload payload) {
-        if (payload == null) return;
+    public int execute(SlackPayload payload) {
+        if (payload == null) return HttpStatus.NO_CONTENT.value();
 
         try {
-            log.info(String.valueOf(slack.send(payload.getUrl(), payload.getPayload())));
+            var response = slack.send(payload.getUrl(), payload.getData());
+            log.info(String.valueOf(response));
+            return response.getCode();
         } catch (IOException e) {
-            log.error("Error while sending {} to webhook: {}", payload.getPayload(), payload.getUrl());
+            log.error("Error while sending {} to webhook: {}", payload.getData(), payload.getUrl());
+            return HttpStatus.INTERNAL_SERVER_ERROR.value();
         }
     }
 }
diff --git a/src/main/java/com/whiskels/notifier/slack/reporter/AbstractEmployeeEventReporter.java b/src/main/java/com/whiskels/notifier/slack/reporter/AbstractEmployeeEventReporter.java
@@ -39,11 +39,11 @@ public AbstractEmployeeEventReporter(@Value("${slack.employee.webhook}") String
 
     protected abstract List<Predicate<EmployeeDto>> birthdayPredicates();
 
-    protected final SlackPayload prepare(String header) {
-        return prepare(header, false);
+    protected final SlackPayload createPayload(String header) {
+        return createPayload(header, false);
     }
 
-    protected final SlackPayload prepare(String header, boolean skipEmpty) {
+    protected final SlackPayload createPayload(String header, boolean skipEmpty) {
         log.debug("Creating employee event payload");
         SlackPayloadBuilder builder = builder()
                 .hook(webHook)
diff --git a/src/main/java/com/whiskels/notifier/slack/reporter/SlackReporter.java b/src/main/java/com/whiskels/notifier/slack/reporter/SlackReporter.java
@@ -1,7 +1,6 @@
 package com.whiskels.notifier.slack.reporter;
 
 import com.whiskels.notifier.external.ReportSupplier;
-import com.whiskels.notifier.slack.SlackPayload;
 import com.whiskels.notifier.slack.SlackWebHookExecutor;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -13,5 +12,5 @@ public abstract class SlackReporter<T> {
     protected final SlackWebHookExecutor executor;
     protected final ReportSupplier<T> provider;
 
-    public abstract SlackPayload prepare();
+    public abstract void prepareAndSend();
 }
diff --git a/src/main/java/com/whiskels/notifier/slack/reporter/impl/CustomerEventReporterAtMonthMiddle.java b/src/main/java/com/whiskels/notifier/slack/reporter/impl/CustomerEventReporterAtMonthMiddle.java
@@ -3,7 +3,6 @@
 import com.whiskels.notifier.common.util.Util;
 import com.whiskels.notifier.external.ReportSupplier;
 import com.whiskels.notifier.external.google.customer.CustomerBirthdayInfoDto;
-import com.whiskels.notifier.slack.SlackPayload;
 import com.whiskels.notifier.slack.SlackWebHookExecutor;
 import com.whiskels.notifier.slack.reporter.AbstractCustomerEventReporter;
 import org.springframework.beans.factory.annotation.Value;
@@ -34,11 +33,12 @@ public CustomerEventReporterAtMonthMiddle(@Value("${slack.customer.birthday.webh
 
     @Scheduled(cron = "${slack.customer.birthday.month-middle.cron:0 0 9 15 * *}", zone = "${common.timezone}")
     public void executeScheduled() {
-        executor.execute(prepare());
+        prepareAndSend();
     }
 
-    public SlackPayload prepare() {
-        return createPayload(header);
+    public void prepareAndSend() {
+        var payload = createPayload(header);
+        executor.execute(payload);
     }
 
     protected List<Predicate<CustomerBirthdayInfoDto>> birthdayPredicates() {
diff --git a/src/main/java/com/whiskels/notifier/slack/reporter/impl/CustomerEventReporterAtMonthStart.java b/src/main/java/com/whiskels/notifier/slack/reporter/impl/CustomerEventReporterAtMonthStart.java
@@ -2,7 +2,6 @@
 
 import com.whiskels.notifier.external.ReportSupplier;
 import com.whiskels.notifier.external.google.customer.CustomerBirthdayInfoDto;
-import com.whiskels.notifier.slack.SlackPayload;
 import com.whiskels.notifier.slack.SlackWebHookExecutor;
 import com.whiskels.notifier.slack.reporter.AbstractCustomerEventReporter;
 import org.springframework.beans.factory.annotation.Value;
@@ -33,11 +32,12 @@ public CustomerEventReporterAtMonthStart(@Value("${slack.customer.birthday.webho
 
     @Scheduled(cron = "${slack.customer.birthday.month-start.cron:0 0 9 1 * *}", zone = "${common.timezone}")
     public void executeScheduled() {
-        executor.execute(prepare());
+        prepareAndSend();
     }
 
-    public SlackPayload prepare() {
-        return createPayload(header);
+    public void prepareAndSend() {
+        var payload =  createPayload(header);
+        executor.execute(payload);
     }
 
     protected List<Predicate<CustomerBirthdayInfoDto>> birthdayPredicates() {
diff --git a/src/main/java/com/whiskels/notifier/slack/reporter/impl/CustomerEventReporterOnEvent.java b/src/main/java/com/whiskels/notifier/slack/reporter/impl/CustomerEventReporterOnEvent.java
@@ -3,7 +3,6 @@
 import com.whiskels.notifier.common.util.Util;
 import com.whiskels.notifier.external.ReportSupplier;
 import com.whiskels.notifier.external.google.customer.CustomerBirthdayInfoDto;
-import com.whiskels.notifier.slack.SlackPayload;
 import com.whiskels.notifier.slack.SlackWebHookExecutor;
 import com.whiskels.notifier.slack.reporter.AbstractCustomerEventReporter;
 import org.springframework.beans.factory.annotation.Value;
@@ -34,12 +33,13 @@ public CustomerEventReporterOnEvent(@Value("${slack.customer.birthday.webhook}")
 
     @Scheduled(cron = "${slack.customer.birthday.daily.cron:0 0 9 * * *}", zone = "${common.timezone}")
     public void executeScheduled() {
-        executor.execute(prepare());
+        prepareAndSend();
     }
 
-    public SlackPayload prepare() {
+    public void prepareAndSend() {
         var data = provider.get();
-        return createPayload(header + reportDate(data.getReportDate()), true);
+        var payload =  createPayload(header + reportDate(data.getReportDate()), true);
+        executor.execute(payload);
     }
 
     protected List<Predicate<CustomerBirthdayInfoDto>> birthdayPredicates() {
diff --git a/src/main/java/com/whiskels/notifier/slack/reporter/impl/DebtDailyReporter.java b/src/main/java/com/whiskels/notifier/slack/reporter/impl/DebtDailyReporter.java
@@ -1,5 +1,6 @@
 package com.whiskels.notifier.slack.reporter.impl;
 
+import com.whiskels.notifier.external.ReportData;
 import com.whiskels.notifier.external.ReportSupplier;
 import com.whiskels.notifier.external.json.debt.DebtDto;
 import com.whiskels.notifier.slack.SlackPayload;
@@ -11,6 +12,9 @@
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import static com.whiskels.notifier.common.util.DateTimeUtil.reportDate;
 import static com.whiskels.notifier.common.util.FormatUtil.COLLECTOR_TWO_NEW_LINES;
 import static com.whiskels.notifier.slack.reporter.builder.SlackPayloadBuilder.builder;
@@ -19,6 +23,7 @@
 @ConditionalOnProperty("slack.customer.debt.webhook")
 @ConditionalOnBean(value = DebtDto.class, parameterizedContainer = ReportSupplier.class)
 class DebtDailyReporter extends SlackReporter<DebtDto> {
+    private static final int SINGLE_REPORT_CUTOFF = 20;
     private final String header;
 
     public DebtDailyReporter(@Value("${slack.customer.debt.webhook}") String webHook,
@@ -31,17 +36,49 @@ public DebtDailyReporter(@Value("${slack.customer.debt.webhook}") String webHook
 
     @Scheduled(cron = "${slack.customer.debt.cron:0 0 13 * * MON-FRI}", zone = "${common.timezone}")
     public void executeScheduled() {
-        executor.execute(prepare());
+        prepareAndSend();
     }
 
-    public SlackPayload prepare() {
+    public void prepareAndSend() {
         var data = provider.get();
-        return builder()
+        if (data.getContent().size() < SINGLE_REPORT_CUTOFF) {
+            singleReport(data);
+        } else {
+            multiReport(data);
+        }
+    }
+
+    private void singleReport(ReportData<DebtDto> data) {
+        var report = builder()
                 .hook(webHook)
                 .collector(COLLECTOR_TWO_NEW_LINES)
                 .header(header + reportDate(data.getReportDate()))
                 .notifyChannel()
                 .block(data.getContent())
                 .build();
+        executor.execute(report);
+    }
+
+    private void multiReport(ReportData<DebtDto> data) {
+        List<SlackPayload> reports = new ArrayList<>();
+        boolean isFirstReport = true;
+        var content = data.getContent();
+        int reportNum = 1;
+        for (int i = 0; i < content.size(); i += SINGLE_REPORT_CUTOFF) {
+            var currentReportBuilder = builder();
+
+            if (isFirstReport) {
+                currentReportBuilder.notifyChannel();
+                isFirstReport = false;
+            }
+            currentReportBuilder.hook(webHook)
+                    .collector(COLLECTOR_TWO_NEW_LINES)
+                    .header(header + reportDate(data.getReportDate()) + " #" + reportNum++)
+                    .block(content.subList(i, Math.min(content.size(), i + SINGLE_REPORT_CUTOFF)));
+
+            reports.add(currentReportBuilder.build());
+        }
+
+        reports.forEach(executor::execute);
     }
 }
diff --git a/src/main/java/com/whiskels/notifier/slack/reporter/impl/EmployeeEventReporterAtMonthMiddle.java b/src/main/java/com/whiskels/notifier/slack/reporter/impl/EmployeeEventReporterAtMonthMiddle.java
@@ -3,7 +3,6 @@
 import com.whiskels.notifier.common.util.Util;
 import com.whiskels.notifier.external.ReportSupplier;
 import com.whiskels.notifier.external.json.employee.EmployeeDto;
-import com.whiskels.notifier.slack.SlackPayload;
 import com.whiskels.notifier.slack.SlackWebHookExecutor;
 import com.whiskels.notifier.slack.reporter.AbstractEmployeeEventReporter;
 import org.springframework.beans.factory.annotation.Value;
@@ -36,11 +35,12 @@ public EmployeeEventReporterAtMonthMiddle(@Value("${slack.employee.webhook}") St
 
     @Scheduled(cron = "${slack.employee.month-middle.cron:0 0 9 15 * *}", zone = "${common.timezone}")
     public void executeScheduled() {
-        executor.execute(prepare());
+        prepareAndSend();
     }
 
-    public SlackPayload prepare() {
-        return prepare(header);
+    public void prepareAndSend() {
+        var payload = createPayload(header);
+        executor.execute(payload);
     }
 
     protected List<Predicate<EmployeeDto>> birthdayPredicates() {
diff --git a/src/main/java/com/whiskels/notifier/slack/reporter/impl/EmployeeEventReporterAtMonthStart.java b/src/main/java/com/whiskels/notifier/slack/reporter/impl/EmployeeEventReporterAtMonthStart.java
@@ -2,7 +2,6 @@
 
 import com.whiskels.notifier.external.ReportSupplier;
 import com.whiskels.notifier.external.json.employee.EmployeeDto;
-import com.whiskels.notifier.slack.SlackPayload;
 import com.whiskels.notifier.slack.SlackWebHookExecutor;
 import com.whiskels.notifier.slack.reporter.AbstractEmployeeEventReporter;
 import org.springframework.beans.factory.annotation.Value;
@@ -35,11 +34,12 @@ public EmployeeEventReporterAtMonthStart(@Value("${slack.employee.webhook}") Str
 
     @Scheduled(cron = "${slack.employee.cron.monthStart:0 0 9 1 * *}", zone = "${common.timezone}")
     public void executeScheduled() {
-        executor.execute(prepare());
+        prepareAndSend();
     }
 
-    public SlackPayload prepare() {
-        return prepare(header);
+    public void prepareAndSend() {
+        var payload =  createPayload(header);
+        executor.execute(payload);
     }
 
     protected List<Predicate<EmployeeDto>> birthdayPredicates() {
diff --git a/src/main/java/com/whiskels/notifier/slack/reporter/impl/EmployeeEventReporterOnEvent.java b/src/main/java/com/whiskels/notifier/slack/reporter/impl/EmployeeEventReporterOnEvent.java
@@ -3,7 +3,6 @@
 import com.whiskels.notifier.common.util.Util;
 import com.whiskels.notifier.external.ReportSupplier;
 import com.whiskels.notifier.external.json.employee.EmployeeDto;
-import com.whiskels.notifier.slack.SlackPayload;
 import com.whiskels.notifier.slack.SlackWebHookExecutor;
 import com.whiskels.notifier.slack.reporter.AbstractEmployeeEventReporter;
 import org.springframework.beans.factory.annotation.Value;
@@ -36,13 +35,14 @@ public EmployeeEventReporterOnEvent(@Value("${slack.employee.webhook}") String w
 
     @Scheduled(cron = "${slack.employee.daily.cron:0 0 9 * * *}", zone = "${common.timezone}")
     public void sendScheduled() {
-        executor.execute(prepare());
+        prepareAndSend();
     }
 
-    public SlackPayload prepare() {
+    public void prepareAndSend() {
 
         var data = provider.get();
-        return prepare(header + reportDate(data.getReportDate()), true);
+        var payload = createPayload(header + reportDate(data.getReportDate()), true);
+        executor.execute(payload);
     }
 
     protected List<Predicate<EmployeeDto>> birthdayPredicates() {
diff --git a/src/main/java/com/whiskels/notifier/slack/reporter/impl/PaymentDailyReporter.java b/src/main/java/com/whiskels/notifier/slack/reporter/impl/PaymentDailyReporter.java
@@ -2,7 +2,6 @@
 
 import com.whiskels.notifier.external.ReportSupplier;
 import com.whiskels.notifier.external.json.operation.PaymentDto;
-import com.whiskels.notifier.slack.SlackPayload;
 import com.whiskels.notifier.slack.SlackWebHookExecutor;
 import com.whiskels.notifier.slack.reporter.SlackReporter;
 import com.whiskels.notifier.slack.reporter.builder.SlackPayloadBuilder;
@@ -47,20 +46,21 @@ public PaymentDailyReporter(@Value("${slack.customer.payment.webhook}") String w
 
     @Scheduled(cron = "${slack.customer.payment.cron:0 1 13 * * MON-FRI}", zone = "${common.timezone}")
     public void executeScheduled() {
-        executor.execute(prepare());
+        prepareAndSend();
     }
 
-    public SlackPayload prepare() {
+    public void prepareAndSend() {
         log.debug("Creating employee event payload");
         var data = provider.get();
 
-        return SlackPayloadBuilder.builder()
+        var payload =  SlackPayloadBuilder.builder()
                 .hook(webHook)
                 .notifyChannel()
                 .header(header + reportDate(data.getReportDate()))
                 .collector(COLLECTOR_NEW_LINE)
                 .block(data.getContent(), reportPic(data.getContent()))
                 .build();
+        executor.execute(payload);
     }
 
     private String reportPic(List<PaymentDto> data) {
diff --git a/src/main/java/com/whiskels/notifier/telegram/handler/admin/AdminSlackHandler.java b/src/main/java/com/whiskels/notifier/telegram/handler/admin/AdminSlackHandler.java
@@ -14,15 +14,13 @@
 @Service
 @ConditionalOnBean(SlackReporter.class)
 class AdminSlackHandler extends BeanCallingHandler<SlackReporter<?>> {
-    private final SlackWebHookExecutor executor;
 
     public AdminSlackHandler(List<SlackReporter<?>> reporters, SlackWebHookExecutor executor) {
         super("Manual slack reporter activation", reporters,
                 reporter -> {
-                    executor.execute(reporter.prepare());
+                    reporter.prepareAndSend();
                     return "Called " + getTelegramLabel(reporter);
                 });
-        this.executor = executor;
     }
 
     @Override

Original file line number	Diff line number	Diff line change
`@@ -8,5 +8,5 @@`
`8`	`8`	`@Getter`
`9`	`9`	`public class SlackPayload {`
`10`	`10`	`private final String url;`
`11`		`- private final Payload payload;`
	`11`	`+ private final Payload data;`
`12`	`12`	`}`