Page MenuHomePhabricator
Files F3374555

D12832.diff
No OneTemporary
Actions

D12832.diff
View Options

diff --git a/services/identity/src/database.rs b/services/identity/src/database.rs
--- a/services/identity/src/database.rs
+++ b/services/identity/src/database.rs
@@ -969,24 +969,43 @@
.client
.scan()
.table_name(USERS_TABLE)
- .projection_expression(format!(
- "{USERS_TABLE_USERNAME_ATTRIBUTE}, {USERS_TABLE_PARTITION_KEY}"
- ))
+ .projection_expression("#userID, #username, #walletAddress")
+ .expression_attribute_names("#userID", USERS_TABLE_PARTITION_KEY)
+ .expression_attribute_names("#username", USERS_TABLE_USERNAME_ATTRIBUTE)
+ .expression_attribute_names(
+ "#walletAddress",
+ USERS_TABLE_WALLET_ADDRESS_ATTRIBUTE,
+ )
.send()
.await
.map_err(|e| Error::AwsSdk(e.into()))?;
let mut result = Vec::new();
- if let Some(attributes) = scan_output.items {
- for mut attribute in attributes {
- if let (Ok(username), Ok(user_id)) = (
- attribute.take_attr(USERS_TABLE_USERNAME_ATTRIBUTE),
- attribute.take_attr(USERS_TABLE_PARTITION_KEY),
- ) {
- result.push(UserDetail { username, user_id });
- }
+
+ let Some(items) = scan_output.items else {
+ return Ok(result);
+ };
+
+ for mut item in items {
+ let Ok(user_id) = item.take_attr(USERS_TABLE_PARTITION_KEY) else {
+ error!(
+ errorType = error_types::GENERIC_DB_LOG,
+ "Partition key missing for item"
+ );
+ continue;
+ };
+ if let Ok(username) = item.take_attr(USERS_TABLE_USERNAME_ATTRIBUTE) {
+ result.push(UserDetail { username, user_id });
+ } else if let Ok(wallet_address) =
+ item.take_attr(USERS_TABLE_WALLET_ADDRESS_ATTRIBUTE)
+ {
+ result.push(UserDetail {
+ username: wallet_address,
+ user_id,
+ })
}
}
+
Ok(result)
}
diff --git a/services/identity/src/database/device_list.rs b/services/identity/src/database/device_list.rs
--- a/services/identity/src/database/device_list.rs
+++ b/services/identity/src/database/device_list.rs
@@ -933,7 +933,7 @@
.and_then(|list| list.device_ids.first())
else {
error!(
- user_id = redact_sensitive_data(&user_id),
+ user_id = redact_sensitive_data(user_id),
errorType = error_types::DEVICE_LIST_DB_LOG,
"Device list is empty. Cannot fetch primary device"
);

File Metadata

Mime Type
text/plain
Expires
Wed, Nov 27, 4:05 PM (21 h, 34 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2590928
Default Alt Text
D12832.diff (2 KB)

Event Timeline