Merge pull request #279 from RakSrinaNa/fix/update-summary

Fix unknown field 'summaries_by_display_type' in update-summary
RakambdaOrg · Sep 8, 2022 · 7184f62 · 7184f62
2 parents 6727656 + 5b5f3f8
commit 7184f62
Show file tree

Hide file tree

Showing 6 changed files with 91 additions and 1 deletion.
diff --git a/...srinana/channelpointsminer/miner/api/ws/data/message/subtype/NotificationDisplayType.java b/...srinana/channelpointsminer/miner/api/ws/data/message/subtype/NotificationDisplayType.java
@@ -1,5 +1,6 @@
 package fr.raksrinana.channelpointsminer.miner.api.ws.data.message.subtype;
 
 public enum NotificationDisplayType{
+	CREATOR,
 	VIEWER
 }
diff --git a/.../raksrinana/channelpointsminer/miner/api/ws/data/message/subtype/NotificationSummary.java b/.../raksrinana/channelpointsminer/miner/api/ws/data/message/subtype/NotificationSummary.java
@@ -11,6 +11,8 @@
 import lombok.ToString;
 import org.jetbrains.annotations.NotNull;
 import java.time.ZonedDateTime;
+import java.util.HashMap;
+import java.util.Map;
 
 @NoArgsConstructor
 @AllArgsConstructor
@@ -29,4 +31,8 @@ public class NotificationSummary{
 	private int viewerUnreadCount;
 	@JsonProperty("creator_unread_count")
 	private int creatorUnreadCount;
+	@NotNull
+	@JsonProperty("summaries_by_display_type")
+	@Builder.Default
+	private Map<NotificationDisplayType, NotificationSummaryByDisplayType> summariesByDisplayType = new HashMap<>();
 }
diff --git a/...hannelpointsminer/miner/api/ws/data/message/subtype/NotificationSummaryByDisplayType.java b/...hannelpointsminer/miner/api/ws/data/message/subtype/NotificationSummaryByDisplayType.java
@@ -0,0 +1,28 @@
+package fr.raksrinana.channelpointsminer.miner.api.ws.data.message.subtype;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import fr.raksrinana.channelpointsminer.miner.util.json.ISO8601ZonedDateTimeDeserializer;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+import org.jetbrains.annotations.NotNull;
+import java.time.ZonedDateTime;
+import java.util.HashMap;
+import java.util.Map;
+
+@NoArgsConstructor
+@AllArgsConstructor
+@Getter
+@EqualsAndHashCode
+@ToString
+@Builder
+public class NotificationSummaryByDisplayType{
+	@JsonProperty("unread_summary")
+	private Summary unreadSummary;
+	@JsonProperty("unseen_summary")
+	private Summary unseenSummary;
+}
diff --git a/...main/java/fr/raksrinana/channelpointsminer/miner/api/ws/data/message/subtype/Summary.java b/...main/java/fr/raksrinana/channelpointsminer/miner/api/ws/data/message/subtype/Summary.java
@@ -0,0 +1,30 @@
+package fr.raksrinana.channelpointsminer.miner.api.ws.data.message.subtype;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import fr.raksrinana.channelpointsminer.miner.util.json.ISO8601ZonedDateTimeDeserializer;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+import org.jetbrains.annotations.NotNull;
+import java.time.ZonedDateTime;
+import java.util.HashMap;
+import java.util.Map;
+
+@NoArgsConstructor
+@AllArgsConstructor
+@Getter
+@EqualsAndHashCode
+@ToString
+@Builder
+public class Summary{
+	@JsonProperty("count")
+	private int count;
+	@JsonProperty("last_read_all")
+	@JsonDeserialize(using = ISO8601ZonedDateTimeDeserializer.class)
+	@NotNull
+	private ZonedDateTime lastSeenAt;
+}
diff --git a/...fr/raksrinana/channelpointsminer/miner/api/ws/TwitchPubSubWebSocketClientMessageTest.java b/...fr/raksrinana/channelpointsminer/miner/api/ws/TwitchPubSubWebSocketClientMessageTest.java
@@ -38,11 +38,13 @@
 import fr.raksrinana.channelpointsminer.miner.api.ws.data.message.subtype.CommunityPointsMultiplier;
 import fr.raksrinana.channelpointsminer.miner.api.ws.data.message.subtype.NotificationDisplayType;
 import fr.raksrinana.channelpointsminer.miner.api.ws.data.message.subtype.NotificationSummary;
+import fr.raksrinana.channelpointsminer.miner.api.ws.data.message.subtype.NotificationSummaryByDisplayType;
 import fr.raksrinana.channelpointsminer.miner.api.ws.data.message.subtype.PointGain;
 import fr.raksrinana.channelpointsminer.miner.api.ws.data.message.subtype.Prediction;
 import fr.raksrinana.channelpointsminer.miner.api.ws.data.message.subtype.PredictionResultPayload;
 import fr.raksrinana.channelpointsminer.miner.api.ws.data.message.subtype.PredictionResultType;
 import fr.raksrinana.channelpointsminer.miner.api.ws.data.message.subtype.Raid;
+import fr.raksrinana.channelpointsminer.miner.api.ws.data.message.subtype.Summary;
 import fr.raksrinana.channelpointsminer.miner.api.ws.data.message.updatesummary.UpdateSummaryData;
 import fr.raksrinana.channelpointsminer.miner.api.ws.data.message.watchpartyvod.Vod;
 import fr.raksrinana.channelpointsminer.miner.api.ws.data.request.topic.Topic;
@@ -62,6 +64,7 @@
 import java.time.Instant;
 import java.time.ZonedDateTime;
 import java.util.List;
+import java.util.Map;
 import static fr.raksrinana.channelpointsminer.miner.api.ws.data.message.subtype.PointReasonCode.CLAIM;
 import static fr.raksrinana.channelpointsminer.miner.api.ws.data.request.topic.TopicName.COMMUNITY_MOMENTS_CHANNEL_V1;
 import static fr.raksrinana.channelpointsminer.miner.api.ws.data.request.topic.TopicName.COMMUNITY_POINTS_USER_V1;
@@ -536,6 +539,28 @@ void onUpdateSummary(WebsocketMockServer server){
 												.lastSeenAt(ZonedDateTime.of(2021, 1, 1, 19, 41, 56, 957079333, UTC))
 												.viewerUnreadCount(8)
 												.creatorUnreadCount(1)
+												.summariesByDisplayType(Map.of(
+														NotificationDisplayType.CREATOR, NotificationSummaryByDisplayType.builder()
+																		.unreadSummary(Summary.builder()
+																				.count(5)
+																				.lastSeenAt(ZonedDateTime.of(2021, 1, 1, 20, 41, 56, 957079333, UTC))
+																				.build())
+																		.unseenSummary(Summary.builder()
+																				.count(6)
+																				.lastSeenAt(ZonedDateTime.of(2021, 1, 1, 21, 41, 56, 957079333, UTC))
+																				.build())
+																.build(),
+														NotificationDisplayType.VIEWER, NotificationSummaryByDisplayType.builder()
+																.unreadSummary(Summary.builder()
+																		.count(7)
+																		.lastSeenAt(ZonedDateTime.of(2021, 1, 1, 22, 41, 56, 957079333, UTC))
+																		.build())
+																.unseenSummary(Summary.builder()
+																		.count(8)
+																		.lastSeenAt(ZonedDateTime.of(2021, 1, 1, 23, 41, 56, 957079333, UTC))
+																		.build())
+																.build()
+												))
 												.build())
 										.build())
 								.build())

diff --git a/miner/src/test/resources/api/ws/updateSummary.json b/miner/src/test/resources/api/ws/updateSummary.json
@@ -2,6 +2,6 @@
   "type": "MESSAGE",
   "data": {
     "topic": "onsite-notifications.123456789",
-    "message": "{\"type\":\"update-summary\",\"data\":{\"summary\":{\"unseen_view_count\":5,\"last_seen_at\":\"2021-01-01T19:41:56.957079333Z\",\"viewer_unread_count\":8,\"creator_unread_count\":1}}}"
+    "message": "{\"type\":\"update-summary\",\"data\":{\"summary\":{\"unseen_view_count\":5,\"last_seen_at\":\"2021-01-01T19:41:56.957079333Z\",\"viewer_unread_count\":8,\"creator_unread_count\":1,\"summaries_by_display_type\":{\"CREATOR\":{\"unread_summary\":{\"count\":5,\"last_read_all\":\"2021-01-01T20:41:56.957079333Z\"},\"unseen_summary\":{\"count\":6,\"last_read_all\":\"2021-01-01T21:41:56.957079333Z\"}},\"VIEWER\":{\"unread_summary\":{\"count\":7,\"last_read_all\":\"2021-01-01T22:41:56.957079333Z\"},\"unseen_summary\":{\"count\":8,\"last_read_all\":\"2021-01-01T23:41:56.957079333Z\"}}}}}}"
   }
 }