MirrorMirror
/
Signal-Server
mirror of https://github.com/signalapp/Signal-Server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove `Subscriptions.PCI`

This commit is contained in:
Chris Eager 2023-01-04 13:18:25 -06:00 committed by Chris Eager
parent b02b00818b
commit 5de51919bb
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
service/src/main/java/org/whispersystems/textsecuregcm/storage/SubscriptionManager.java
View File

@ -6,7 +6,6 @@
package org.whispersystems.textsecuregcm.storage; package org.whispersystems.textsecuregcm.storage;
import static org.whispersystems.textsecuregcm.util.AttributeValues.b; import static org.whispersystems.textsecuregcm.util.AttributeValues.b;
import static org.whispersystems.textsecuregcm.util.AttributeValues.m;
import static org.whispersystems.textsecuregcm.util.AttributeValues.n; import static org.whispersystems.textsecuregcm.util.AttributeValues.n;
import static org.whispersystems.textsecuregcm.util.AttributeValues.s; import static org.whispersystems.textsecuregcm.util.AttributeValues.s;
@ -48,8 +47,6 @@ public class SubscriptionManager {
public static final String KEY_PASSWORD = "P"; // B public static final String KEY_PASSWORD = "P"; // B
public static final String KEY_PROCESSOR_ID_CUSTOMER_ID = "PC"; // B (GSI Hash Key of `pc_to_u` index) public static final String KEY_PROCESSOR_ID_CUSTOMER_ID = "PC"; // B (GSI Hash Key of `pc_to_u` index)
public static final String KEY_CREATED_AT = "R"; // N public static final String KEY_CREATED_AT = "R"; // N
@Deprecated
public static final String KEY_PROCESSOR_CUSTOMER_IDS_MAP = "PCI"; // M
public static final String KEY_SUBSCRIPTION_ID = "S"; // S public static final String KEY_SUBSCRIPTION_ID = "S"; // S
public static final String KEY_SUBSCRIPTION_CREATED_AT = "T"; // N public static final String KEY_SUBSCRIPTION_CREATED_AT = "T"; // N
public static final String KEY_SUBSCRIPTION_LEVEL = "L"; public static final String KEY_SUBSCRIPTION_LEVEL = "L";
@ -264,21 +261,18 @@ public class SubscriptionManager {
.updateExpression("SET " .updateExpression("SET "
+ "#password = if_not_exists(#password, :password), " + "#password = if_not_exists(#password, :password), "
+ "#created_at = if_not_exists(#created_at, :created_at), " + "#created_at = if_not_exists(#created_at, :created_at), "
+ "#accessed_at = if_not_exists(#accessed_at, :accessed_at), " + "#accessed_at = if_not_exists(#accessed_at, :accessed_at)"
+ "#processors_to_customer_ids = if_not_exists(#processors_to_customer_ids, :initial_empty_map)"
) )
.expressionAttributeNames(Map.of( .expressionAttributeNames(Map.of(
"#user", KEY_USER, "#user", KEY_USER,
"#password", KEY_PASSWORD, "#password", KEY_PASSWORD,
"#created_at", KEY_CREATED_AT, "#created_at", KEY_CREATED_AT,
"#accessed_at", KEY_ACCESSED_AT, "#accessed_at", KEY_ACCESSED_AT)
"#processors_to_customer_ids", KEY_PROCESSOR_CUSTOMER_IDS_MAP)
) )
.expressionAttributeValues(Map.of( .expressionAttributeValues(Map.of(
":password", b(password), ":password", b(password),
":created_at", n(createdAt.getEpochSecond()), ":created_at", n(createdAt.getEpochSecond()),
":accessed_at", n(createdAt.getEpochSecond()), ":accessed_at", n(createdAt.getEpochSecond()))
":initial_empty_map", m(Map.of()))
) )
.build(); .build();
return client.updateItem(request).handle((updateItemResponse, throwable) -> { return client.updateItem(request).handle((updateItemResponse, throwable) -> {