Update account status to NotReady for expired lease

CHANGELOG.md

@@ -1,4 +1,5 @@
 ## vNext
+- Fix bug: Status change in account table fails for leased accounts that are expired. See https://github.com/Optum/dce/issues/344
 
 ## v0.30.1
 - Added new tool in `tools` folder for generating Markdown and IAM example policy for AWS Nuke

cmd/lambda/update_lease_status/main.go

@@ -262,6 +262,18 @@ func handleLeaseExpire(input *lambdaHandlerInput, prevLeaseStatus db.LeaseStatus
 		deferredErrors = append(deferredErrors, err)
 	}
 
+	// Update Account Status to "NotReady"
+	_, err = input.dbSvc.TransitionAccountStatus(
+		input.lease.AccountID,
+		db.Leased,
+		db.NotReady,
+	)
+
+	if err != nil {
+		log.Printf("Account status update: Failed to add account to reset queue for lease %s @ %s: %s", input.lease.PrincipalID, input.lease.AccountID, err)
+		deferredErrors = append(deferredErrors, err)
+	}
+
 	// Return errors
 	if len(deferredErrors) > 0 {
 		return multierrors.NewMultiError("Failed to lock over-budget account: ", deferredErrors)

cmd/lambda/update_lease_status/main_test.go

@@ -172,6 +172,8 @@ has exceeded its budget of $100. Actual spend is $150
 				input.lease.LeaseStatus = test.expectedLeaseStatusTransition
 				return input.lease
 			}, test.transitionLeaseError)
+
+			dbSvc.On("TransitionAccountStatus", "1234567890", db.Leased, db.NotReady).Return(nil, nil)
 		}
 
 		// Should send a notification email

tests/acceptance/update_lease_status_test.go

@@ -253,11 +253,16 @@ func TestUpdateLeaseStatusLambda(t *testing.T) {
 		err = json.Unmarshal(result.Payload, &resp)
 		require.Nil(t, err)
 
-		// Check lease status is active
+		// Check lease status is inactive
 		lease, err := dbSvc.GetLease(accountID, "user")
 		require.Nil(t, err)
 		require.Equal(t, db.LeaseStatus("Inactive"), lease.LeaseStatus)
 		require.Equal(t, db.LeaseStatusReason("Expired"), lease.LeaseStatusReason)
+
+		// Check account status is updated to NotReady
+		account, err := dbSvc.GetAccount(accountID)
+		require.Nil(t, err)
+		require.Equal(t, db.NotReady, account.AccountStatus)
 	})
 
 	t.Run("Exceeded lease budget result in Inactive lease with reason OverBudget.", func(t *testing.T) {