Fix notification watch end date and reuse string helper

Co-authored-by: rudrankriyam <[email protected]>

Author: cursoragent

internal/asc/output_server_api.go

@@ -11,15 +11,15 @@ func printServerStatusTable(resp *StatusResponse) error {
 	w := tabwriter.NewWriter(os.Stdout, 0, 0, 2, ' ', 0)
 	fmt.Fprintln(w, "Subscription Group ID\tOriginal Transaction ID\tStatus")
 	for _, item := range resp.Data {
-		groupID := serverStringValue(item.SubscriptionGroupIdentifier)
+		groupID := stringValue(item.SubscriptionGroupIdentifier)
 		if len(item.LastTransactions) == 0 {
 			fmt.Fprintf(w, "%s\t\t\n", groupID)
 			continue
 		}
 		for _, tx := range item.LastTransactions {
 			fmt.Fprintf(w, "%s\t%s\t%s\n",
 				groupID,
-				serverStringValue(tx.OriginalTransactionID),
+				stringValue(tx.OriginalTransactionID),
 				formatServerStatus(tx.Status),
 			)
 		}
@@ -31,15 +31,15 @@ func printServerStatusMarkdown(resp *StatusResponse) error {
 	fmt.Fprintln(os.Stdout, "| Subscription Group ID | Original Transaction ID | Status |")
 	fmt.Fprintln(os.Stdout, "| --- | --- | --- |")
 	for _, item := range resp.Data {
-		groupID := serverStringValue(item.SubscriptionGroupIdentifier)
+		groupID := stringValue(item.SubscriptionGroupIdentifier)
 		if len(item.LastTransactions) == 0 {
 			fmt.Fprintf(os.Stdout, "| %s |  |  |\n", escapeMarkdown(groupID))
 			continue
 		}
 		for _, tx := range item.LastTransactions {
 			fmt.Fprintf(os.Stdout, "| %s | %s | %s |\n",
 				escapeMarkdown(groupID),
-				escapeMarkdown(serverStringValue(tx.OriginalTransactionID)),
+				escapeMarkdown(stringValue(tx.OriginalTransactionID)),
 				escapeMarkdown(formatServerStatus(tx.Status)),
 			)
 		}
@@ -53,7 +53,7 @@ func printServerHistoryTable(resp *HistoryResponse) error {
 	fmt.Fprintf(w, "%d\t%t\t%s\n",
 		len(resp.SignedTransactions),
 		serverBoolValue(resp.HasMore),
-		serverStringValue(resp.Revision),
+		stringValue(resp.Revision),
 	)
 	return w.Flush()
 }
@@ -64,7 +64,7 @@ func printServerHistoryMarkdown(resp *HistoryResponse) error {
 	fmt.Fprintf(os.Stdout, "| %d | %t | %s |\n",
 		len(resp.SignedTransactions),
 		serverBoolValue(resp.HasMore),
-		escapeMarkdown(serverStringValue(resp.Revision)),
+		escapeMarkdown(stringValue(resp.Revision)),
 	)
 	return nil
 }
@@ -75,7 +75,7 @@ func printServerRefundHistoryTable(resp *RefundHistoryResponse) error {
 	fmt.Fprintf(w, "%d\t%t\t%s\n",
 		len(resp.SignedTransactions),
 		serverBoolValue(resp.HasMore),
-		serverStringValue(resp.Revision),
+		stringValue(resp.Revision),
 	)
 	return w.Flush()
 }
@@ -86,22 +86,22 @@ func printServerRefundHistoryMarkdown(resp *RefundHistoryResponse) error {
 	fmt.Fprintf(os.Stdout, "| %d | %t | %s |\n",
 		len(resp.SignedTransactions),
 		serverBoolValue(resp.HasMore),
-		escapeMarkdown(serverStringValue(resp.Revision)),
+		escapeMarkdown(stringValue(resp.Revision)),
 	)
 	return nil
 }
 
 func printServerTransactionInfoTable(resp *TransactionInfoResponse) error {
 	w := tabwriter.NewWriter(os.Stdout, 0, 0, 2, ' ', 0)
 	fmt.Fprintln(w, "Signed Transaction Info")
-	fmt.Fprintf(w, "%s\n", compactWhitespace(serverStringValue(resp.SignedTransactionInfo)))
+	fmt.Fprintf(w, "%s\n", compactWhitespace(stringValue(resp.SignedTransactionInfo)))
 	return w.Flush()
 }
 
 func printServerTransactionInfoMarkdown(resp *TransactionInfoResponse) error {
 	fmt.Fprintln(os.Stdout, "| Signed Transaction Info |")
 	fmt.Fprintln(os.Stdout, "| --- |")
-	fmt.Fprintf(os.Stdout, "| %s |\n", escapeMarkdown(compactWhitespace(serverStringValue(resp.SignedTransactionInfo))))
+	fmt.Fprintf(os.Stdout, "| %s |\n", escapeMarkdown(compactWhitespace(stringValue(resp.SignedTransactionInfo))))
 	return nil
 }
 
@@ -128,22 +128,22 @@ func printServerOrderLookupMarkdown(resp *OrderLookupResponse) error {
 func printServerSendTestNotificationTable(resp *SendTestNotificationResponse) error {
 	w := tabwriter.NewWriter(os.Stdout, 0, 0, 2, ' ', 0)
 	fmt.Fprintln(w, "Test Notification Token")
-	fmt.Fprintf(w, "%s\n", compactWhitespace(serverStringValue(resp.TestNotificationToken)))
+	fmt.Fprintf(w, "%s\n", compactWhitespace(stringValue(resp.TestNotificationToken)))
 	return w.Flush()
 }
 
 func printServerSendTestNotificationMarkdown(resp *SendTestNotificationResponse) error {
 	fmt.Fprintln(os.Stdout, "| Test Notification Token |")
 	fmt.Fprintln(os.Stdout, "| --- |")
-	fmt.Fprintf(os.Stdout, "| %s |\n", escapeMarkdown(compactWhitespace(serverStringValue(resp.TestNotificationToken))))
+	fmt.Fprintf(os.Stdout, "| %s |\n", escapeMarkdown(compactWhitespace(stringValue(resp.TestNotificationToken))))
 	return nil
 }
 
 func printServerCheckTestNotificationTable(resp *CheckTestNotificationResponse) error {
 	w := tabwriter.NewWriter(os.Stdout, 0, 0, 2, ' ', 0)
 	fmt.Fprintln(w, "Signed Payload\tSend Attempts")
 	fmt.Fprintf(w, "%s\t%d\n",
-		compactWhitespace(serverStringValue(resp.SignedPayload)),
+		compactWhitespace(stringValue(resp.SignedPayload)),
 		len(resp.SendAttempts),
 	)
 	return w.Flush()
@@ -153,7 +153,7 @@ func printServerCheckTestNotificationMarkdown(resp *CheckTestNotificationRespons
 	fmt.Fprintln(os.Stdout, "| Signed Payload | Send Attempts |")
 	fmt.Fprintln(os.Stdout, "| --- | --- |")
 	fmt.Fprintf(os.Stdout, "| %s | %d |\n",
-		escapeMarkdown(compactWhitespace(serverStringValue(resp.SignedPayload))),
+		escapeMarkdown(compactWhitespace(stringValue(resp.SignedPayload))),
 		len(resp.SendAttempts),
 	)
 	return nil
@@ -165,7 +165,7 @@ func printServerNotificationHistoryTable(resp *NotificationHistoryResponse) erro
 	fmt.Fprintf(w, "%d\t%t\t%s\n",
 		len(resp.NotificationHistory),
 		serverBoolValue(resp.HasMore),
-		serverStringValue(resp.PaginationToken),
+		stringValue(resp.PaginationToken),
 	)
 	return w.Flush()
 }
@@ -176,7 +176,7 @@ func printServerNotificationHistoryMarkdown(resp *NotificationHistoryResponse) e
 	fmt.Fprintf(os.Stdout, "| %d | %t | %s |\n",
 		len(resp.NotificationHistory),
 		serverBoolValue(resp.HasMore),
-		escapeMarkdown(serverStringValue(resp.PaginationToken)),
+		escapeMarkdown(stringValue(resp.PaginationToken)),
 	)
 	return nil
 }
@@ -200,13 +200,6 @@ func formatServerStatus(status *ServerStatus) string {
 	return strconv.Itoa(int(*status))
 }
 
-func serverStringValue(value *string) string {
-	if value == nil {
-		return ""
-	}
-	return *value
-}
-
 func serverBoolValue(value *bool) bool {
 	if value == nil {
 		return false

internal/cli/server/server_notifications.go

@@ -300,8 +300,9 @@ func watchNotificationHistory(ctx context.Context, client *asc.ServerAPIClient,
 	defer ticker.Stop()
 
 	currentStart := request.StartDate
+	originalEndDate := request.EndDate
 	for {
-		endValue := request.EndDate
+		endValue := originalEndDate
 		if endValue == nil {
 			now := time.Now().UnixMilli()
 			endValue = &now