Page MenuHomePhabricator
Files F3399297

D10246.id34412.diff
No OneTemporary
Actions

D10246.id34412.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
@@ -726,8 +726,10 @@
&self,
user_id: String,
) -> Result<DeleteItemOutput, Error> {
- debug!("Attempting to delete user: {}", user_id);
+ debug!(user_id, "Attempting to delete user's devices");
+ device_list::delete_devices_table_rows_for_user(self, &user_id).await?;
+ debug!("Attempting to delete user: {}", user_id);
match self
.client
.delete_item()
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
@@ -6,7 +6,9 @@
use aws_sdk_dynamodb::{
client::fluent_builders::Query,
error::TransactionCanceledException,
- model::{AttributeValue, Put, TransactWriteItem, Update},
+ model::{
+ AttributeValue, DeleteRequest, Put, TransactWriteItem, Update, WriteRequest,
+ },
output::GetItemOutput,
};
use chrono::{DateTime, Utc};
@@ -445,6 +447,57 @@
.await
}
+/// Deletes all user data from devices table
+pub async fn delete_devices_table_rows_for_user(
+ db: &crate::database::DatabaseClient,
+ user_id: impl Into<String>,
+) -> Result<(), Error> {
+ // 1. get all rows
+ // 2. batch write delete all
+
+ // we project only the primary keys so we can pass these directly to delete requests
+ let primary_keys = db
+ .client
+ .query()
+ .table_name(devices_table::NAME)
+ .projection_expression("#user_id, #item_id")
+ .key_condition_expression("#user_id = :user_id")
+ .expression_attribute_names("#user_id", ATTR_USER_ID)
+ .expression_attribute_names("#item_id", ATTR_ITEM_ID)
+ .expression_attribute_values(":user_id", AttributeValue::S(user_id.into()))
+ .send()
+ .await
+ .map_err(|e| {
+ error!("Failed to list user's items in devices table: {:?}", e);
+ Error::AwsSdk(e.into())
+ })?
+ .items
+ .unwrap_or_default();
+
+ let delete_requests = primary_keys
+ .into_iter()
+ .map(|item| {
+ let request = DeleteRequest::builder().set_key(Some(item)).build();
+ WriteRequest::builder().delete_request(request).build()
+ })
+ .collect::<Vec<_>>();
+
+ // TODO: We can use the batch write helper from comm-services-lib when integrated
+ for batch in delete_requests.chunks(25) {
+ db.client
+ .batch_write_item()
+ .request_items(devices_table::NAME, batch.to_vec())
+ .send()
+ .await
+ .map_err(|e| {
+ error!("Failed to batch delete items from devices table: {:?}", e);
+ Error::AwsSdk(e.into())
+ })?;
+ }
+
+ Ok(())
+}
+
/// Gets timestamp of user's current device list. Returns None if the user
/// doesn't have a device lsit yet. Storing the timestamp in the users table is
/// required for consistency. It's used as a condition when updating the device

File Metadata

Mime Type
text/plain
Expires
Tue, Dec 3, 2:56 AM (20 h, 8 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2609872
Default Alt Text
D10246.id34412.diff (2 KB)

Event Timeline