fix: resolve bugs with user service

Author: jeastham1993

src/user-management-service/lib/constructs/lambdaFunction.ts

@@ -37,6 +37,7 @@ export class InstrumentedLambdaFunction extends Construct {
       functionName: `CDK-${props.sharedProps.serviceName}-${id}-${props.sharedProps.environment}`,
       manifestPath: props.manifestPath,
       memorySize: 256,
+      timeout: Duration.seconds(30),
       environment: {
         DEPLOYED_AT: new Date().toISOString(),
         DD_OTLP_CONFIG_RECEIVER_PROTOCOLS_HTTP_ENDPOINT: "localhost:4318",

src/user-management-service/src/user-management/core/src/adapters.rs

@@ -84,13 +84,14 @@ impl DynamoDbRepository {
                 AttributeValue::N(details.order_count.to_string()),
             );
 
-        let res = if details.last_active.is_some() {
-            put_item_builder.clone().item(
-                LAST_ACTIVE_KEY,
-                AttributeValue::S(details.last_active.unwrap().to_string()),
-            );
-
-            put_item_builder.send().await
+        let res = if let Some(last_active) = details.last_active {
+            put_item_builder
+                .item(
+                    LAST_ACTIVE_KEY,
+                    AttributeValue::S(last_active.to_string()),
+                )
+                .send()
+                .await
         } else {
             put_item_builder.send().await
         };
@@ -546,7 +547,7 @@ impl Repository for DynamoDbRepository {
             .delete_item()
             .table_name(&self.table_name)
             .key(PARTITION_KEY, AttributeValue::S(format!("CODE#{}", code)))
-            .key(SORT_KEY, AttributeValue::S(format!("CODE#{}", code)))
+            .key(SORT_KEY, AttributeValue::S("METADATA".to_string()))
             .send()
             .await;
 

src/user-management-service/src/user-management/lambdas/create_user/src/main.rs

@@ -34,7 +34,7 @@ async fn main() -> Result<(), Error> {
         }
     };
 
-    let _ = TRACER_PROVIDER.set(otel_providers.unwrap().0);
+    if let Some(providers) = otel_providers { let _ = TRACER_PROVIDER.set(providers.0); }
 
     let table_name = env::var("TABLE_NAME").expect("TABLE_NAME is not set");
     let config = aws_config::load_from_env().await;

src/user-management-service/src/user-management/lambdas/get_user_details/src/main.rs

@@ -77,7 +77,7 @@ async fn main() -> Result<(), Error> {
         }
     };
 
-    let _ = TRACER_PROVIDER.set(otel_providers.unwrap().0);
+    if let Some(providers) = otel_providers { let _ = TRACER_PROVIDER.set(providers.0); }
 
     let table_name = env::var("TABLE_NAME").expect("TABLE_NAME is not set");
     let config = aws_config::load_from_env().await;

src/user-management-service/src/user-management/lambdas/handle_order_completed_for_user/src/main.rs

@@ -25,7 +25,7 @@ async fn main() -> Result<(), Error> {
         }
     };
 
-    let _ = TRACER_PROVIDER.set(otel_providers.unwrap().0);
+    if let Some(providers) = otel_providers { let _ = TRACER_PROVIDER.set(providers.0); }
     let table_name = env::var("TABLE_NAME").expect("TABLE_NAME is not set");
     let config = aws_config::load_from_env().await;
     let dynamodb_client = aws_sdk_dynamodb::Client::new(&config);

src/user-management-service/src/user-management/lambdas/login/src/main.rs

@@ -60,7 +60,7 @@ async fn main() -> Result<(), Error> {
         }
     };
 
-    let _ = TRACER_PROVIDER.set(otel_providers.unwrap().0);
+    if let Some(providers) = otel_providers { let _ = TRACER_PROVIDER.set(providers.0); }
     let table_name = env::var("TABLE_NAME").expect("TABLE_NAME is not set");
     let config = aws_config::load_from_env().await;
     let dynamodb_client = aws_sdk_dynamodb::Client::new(&config);

src/user-management-service/src/user-management/lambdas/oauth_authorize/src/main.rs

@@ -227,7 +227,7 @@ async fn main() -> Result<(), Error> {
         }
     };
 
-    let _ = TRACER_PROVIDER.set(otel_providers.unwrap().0);
+    if let Some(providers) = otel_providers { let _ = TRACER_PROVIDER.set(providers.0); }
     let table_name = env::var("TABLE_NAME").expect("TABLE_NAME is not set");
     let config = aws_config::load_from_env().await;
     let dynamodb_client = aws_sdk_dynamodb::Client::new(&config);

src/user-management-service/src/user-management/lambdas/oauth_authorize_callback/src/main.rs

@@ -111,7 +111,7 @@ async fn main() -> Result<(), Error> {
         }
     };
 
-    let _ = TRACER_PROVIDER.set(otel_providers.unwrap().0);
+    if let Some(providers) = otel_providers { let _ = TRACER_PROVIDER.set(providers.0); }
     let table_name = env::var("TABLE_NAME").expect("TABLE_NAME is not set");
     let config = aws_config::load_from_env().await;
     let dynamodb_client = aws_sdk_dynamodb::Client::new(&config);

src/user-management-service/src/user-management/lambdas/oauth_client_delete/src/main.rs

@@ -62,7 +62,7 @@ async fn main() -> Result<(), Error> {
         }
     };
 
-    let _ = TRACER_PROVIDER.set(otel_providers.unwrap().0);
+    if let Some(providers) = otel_providers { let _ = TRACER_PROVIDER.set(providers.0); }
     let table_name = env::var("TABLE_NAME").expect("TABLE_NAME is not set");
     let config = aws_config::load_from_env().await;
     let dynamodb_client = aws_sdk_dynamodb::Client::new(&config);

src/user-management-service/src/user-management/lambdas/oauth_client_get/src/main.rs

@@ -62,7 +62,7 @@ async fn main() -> Result<(), Error> {
         }
     };
 
-    let _ = TRACER_PROVIDER.set(otel_providers.unwrap().0);
+    if let Some(providers) = otel_providers { let _ = TRACER_PROVIDER.set(providers.0); }
     let table_name = env::var("TABLE_NAME").expect("TABLE_NAME is not set");
     let config = aws_config::load_from_env().await;
     let dynamodb_client = aws_sdk_dynamodb::Client::new(&config);