Signal/Signal-Server
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Server synced 2026-04-21 07:08:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove IssuedReceiptMigrationCommand

Browse Source
This commit is contained in:
Ravi Khadiwala
2024-12-09 11:37:14 -06:00
committed by ravi-signal
parent f16428ce2a
commit 1970741049
4 changed files with 0 additions and 283 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
service/src/test/java/org/whispersystems/textsecuregcm/storage/IssuedReceiptsManagerTest.java
View File

@@ -12,13 +12,10 @@ import static org.mockito.Mockito.when;
import jakarta.ws.rs.ClientErrorException;
import java.time.Duration;
import java.time.Instant;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.CompletableFuture;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
import java.util.stream.Stream;
import org.assertj.core.api.Condition;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -28,13 +25,11 @@ import org.whispersystems.textsecuregcm.storage.DynamoDbExtensionSchema.Tables;
import org.whispersystems.textsecuregcm.subscriptions.PaymentProvider;
import org.whispersystems.textsecuregcm.util.AttributeValues;
import org.whispersystems.textsecuregcm.util.TestRandomUtil;
import reactor.core.scheduler.Schedulers;
import software.amazon.awssdk.core.SdkBytes;
import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
import software.amazon.awssdk.services.dynamodb.model.GetItemRequest;
import software.amazon.awssdk.services.dynamodb.model.GetItemResponse;
import software.amazon.awssdk.services.dynamodb.model.UpdateItemRequest;
class IssuedReceiptsManagerTest {
@@ -93,74 +88,6 @@ class IssuedReceiptsManagerTest {
assertThat(future).succeedsWithin(Duration.ofSeconds(3));
}
@Test
void testMigrateToTagSet() {
Instant now = Instant.ofEpochSecond(NOW_EPOCH_SECONDS);
issuedReceiptsManager
.recordIssuance("itemId", PaymentProvider.STRIPE, randomReceiptCredentialRequest(), now)
.join();
removeTagSet("itemId");
assertThat(getItem("itemId").item()).doesNotContainKey(IssuedReceiptsManager.KEY_ISSUED_RECEIPT_TAG_SET);
final IssuedReceiptsManager.IssuedReceipt issuedReceipt = issuedReceiptsManager
.receiptsWithoutTagSet(1, Schedulers.immediate())
.blockFirst();
issuedReceiptsManager.migrateToTagSet(issuedReceipt).join();
final Map<String, AttributeValue> item = getItem("itemId").item();
assertThat(item)
.containsKey(IssuedReceiptsManager.KEY_ISSUED_RECEIPT_TAG_SET)
.containsKey(IssuedReceiptsManager.KEY_ISSUED_RECEIPT_TAG);
final List<byte[]> tags = item
.get(IssuedReceiptsManager.KEY_ISSUED_RECEIPT_TAG_SET).bs()
.stream()
.map(SdkBytes::asByteArray)
.toList();
assertThat(tags).hasSize(1);
final byte[] tag = item.get(IssuedReceiptsManager.KEY_ISSUED_RECEIPT_TAG).b().asByteArray();
assertThat(tags).first().isEqualTo(tag);
}
@Test
void testReceiptsWithoutTagSet() {
Instant now = Instant.ofEpochSecond(NOW_EPOCH_SECONDS);
final int numItems = 100;
final List<String> expectedNoTagSet = IntStream.range(0, numItems)
.boxed()
.flatMap(i -> {
final String itemId = "item-%s".formatted(i);
issuedReceiptsManager.recordIssuance(itemId, PaymentProvider.STRIPE, randomReceiptCredentialRequest(), now).join();
if (i % 2 == 0) {
removeTagSet(itemId);
return Stream.of(itemId);
} else {
return Stream.empty();
}
}).toList();
final List<String> items = issuedReceiptsManager
.receiptsWithoutTagSet(1, Schedulers.immediate())
.map(IssuedReceiptsManager.IssuedReceipt::itemId)
.collectList().block();
assertThat(items).hasSize(numItems / 2);
assertThat(items).containsExactlyInAnyOrderElementsOf(expectedNoTagSet);
}
@Test
void testMigrateAfterRecordExpires() {
final IssuedReceiptsManager.IssuedReceipt issued = new IssuedReceiptsManager.IssuedReceipt("itemId",
TestRandomUtil.nextBytes(32));
// We should succeed but do nothing if the item is deleted by the time we try to migrate it
issuedReceiptsManager.migrateToTagSet(issued).join();
assertThat(getItem("itemId").hasItem()).isFalse();
}
private GetItemResponse getItem(final String itemId) {
final DynamoDbClient client = DYNAMO_DB_EXTENSION.getDynamoDbClient();
@@ -176,15 +103,4 @@ class IssuedReceiptsManagerTest {
when(request.serialize()).thenReturn(bytes);
return request;
}
private void removeTagSet(final String itemId) {
final DynamoDbClient client = DYNAMO_DB_EXTENSION.getDynamoDbClient();
// Simulate an entry that was written before we wrote the tag set field
client.updateItem(UpdateItemRequest.builder()
.tableName(Tables.ISSUED_RECEIPTS.tableName())
.key(Map.of(IssuedReceiptsManager.KEY_PROCESSOR_ITEM_ID, AttributeValues.s(itemId)))
.updateExpression("REMOVE #tags")
.expressionAttributeNames(Map.of("#tags", IssuedReceiptsManager.KEY_ISSUED_RECEIPT_TAG_SET))
.build());
}
}