fix: linting and credo warnings

Author: hamir-suspect

guard/lib/guard/store/service_account.ex

@@ -63,7 +63,10 @@ defmodule Guard.Store.ServiceAccount do
     end
   rescue
     e ->
-      Logger.error("Error during find_many for service accounts #{inspect(service_account_ids)}: #{inspect(e)}")
+      Logger.error(
+        "Error during find_many for service accounts #{inspect(service_account_ids)}: #{inspect(e)}"
+      )
+
       {:error, :internal_error}
   end
 
@@ -210,30 +213,26 @@ defmodule Guard.Store.ServiceAccount do
   """
   @spec reactivate(String.t()) :: {:ok, :reactivated} | {:error, :not_found | :internal_error}
   def reactivate(service_account_id) when is_binary(service_account_id) do
-    if valid_uuid?(service_account_id) do
-      case FrontRepo.transaction(fn ->
-             # Use a modified query that includes deactivated service accounts
-             query =
-               build_service_account_query()
-               |> where([sa, u], sa.id == ^service_account_id)
-               |> where([sa, u], is_nil(u.blocked_at))
-
-             case FrontRepo.one(query) do
-               nil ->
-                 FrontRepo.rollback(:not_found)
-
-               _service_account ->
-                 case reactivate_user_record(service_account_id) do
-                   {:ok, _updated_user} -> :reactivated
-                   {:error, _reason} -> FrontRepo.rollback(:internal_error)
-                 end
-             end
-           end) do
-        {:ok, :reactivated} -> {:ok, :reactivated}
-        {:error, reason} -> {:error, reason}
-      end
-    else
-      {:error, :invalid_id}
+    case FrontRepo.transaction(fn ->
+           # Use a modified query that includes deactivated service accounts
+           query =
+             build_service_account_query()
+             |> where([sa, u], sa.id == ^service_account_id)
+             |> where([sa, u], is_nil(u.blocked_at))
+
+           with service_account when not is_nil(service_account) <- FrontRepo.one(query),
+                {:ok, _updated_user} <- reactivate_user_record(service_account_id) do
+             :reactivated
+           else
+             nil ->
+               FrontRepo.rollback(:not_found)
+
+             {:error, _reason} ->
+               FrontRepo.rollback(:internal_error)
+           end
+         end) do
+      {:ok, :reactivated} -> {:ok, :reactivated}
+      {:error, reason} -> {:error, reason}
     end
   rescue
     e ->

guard/test/guard/grpc_servers/service_account_server_test.exs

@@ -7,7 +7,6 @@ defmodule Guard.GrpcServers.ServiceAccountServerTest do
   alias InternalApi.ServiceAccount
   alias InternalApi.ServiceAccount.ServiceAccountService.Stub
   alias Guard.GrpcServers.ServiceAccountServer
-  alias Support.Factories.ServiceAccountFactory
 
   setup do
     {:ok, channel} = GRPC.Stub.connect("localhost:50051")
@@ -237,6 +236,7 @@ defmodule Guard.GrpcServers.ServiceAccountServerTest do
           )
 
         {:ok, response} = channel |> Stub.list(request)
+        assert response.service_accounts == []
       end
     end
 
@@ -262,7 +262,7 @@ defmodule Guard.GrpcServers.ServiceAccountServerTest do
             page_token: ""
           )
 
-        {:ok, response} = channel |> Stub.list(request)
+        {:ok, _response} = channel |> Stub.list(request)
       end
     end
 
@@ -729,7 +729,7 @@ defmodule Guard.GrpcServers.ServiceAccountServerTest do
       ]) do
         request = ServiceAccount.DeactivateRequest.new(service_account_id: service_account_id)
 
-        {:ok, response} = channel |> Stub.deactivate(request)
+        {:ok, _response} = channel |> Stub.deactivate(request)
       end
     end
 
@@ -788,7 +788,7 @@ defmodule Guard.GrpcServers.ServiceAccountServerTest do
       ]) do
         request = ServiceAccount.ReactivateRequest.new(service_account_id: service_account_id)
 
-        {:ok, response} = channel |> Stub.reactivate(request)
+        {:ok, _response} = channel |> Stub.reactivate(request)
       end
     end
 
@@ -847,7 +847,7 @@ defmodule Guard.GrpcServers.ServiceAccountServerTest do
       ]) do
         request = ServiceAccount.DestroyRequest.new(service_account_id: service_account_id)
 
-        {:ok, response} = channel |> Stub.destroy(request)
+        {:ok, _response} = channel |> Stub.destroy(request)
       end
     end