fix: 123402 AB#123402 Merge pull request #14807 from prefeiturasp/fix…

…/123402 Bug: 123402
prefeiturasp · Aug 30, 2024 · 6988c44 · 6988c44
2 parents f3184eb + 1410c4b
commit 6988c44
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/.../Aluno/ObterMatriculasAlunoPorCodigoEAno/ObterMatriculasAlunoPorCodigoEAnoQueryHandler.cs b/.../Aluno/ObterMatriculasAlunoPorCodigoEAno/ObterMatriculasAlunoPorCodigoEAnoQueryHandler.cs
@@ -1,9 +1,11 @@
 using MediatR;
 using Newtonsoft.Json;
+using SME.SGP.Dominio;
 using SME.SGP.Infra;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Net;
 using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
@@ -21,20 +23,23 @@ public ObterMatriculasAlunoPorCodigoEAnoQueryHandler(IHttpClientFactory httpClie
 
         public async Task<IEnumerable<AlunoPorTurmaResposta>> Handle(ObterMatriculasAlunoPorCodigoEAnoQuery request, CancellationToken cancellationToken)
         {
-            var alunos = Enumerable.Empty<AlunoPorTurmaResposta>();
-
             var httpClient = httpClientFactory.CreateClient(ServicosEolConstants.SERVICO);
 
             var resposta = await httpClient.GetAsync(
                 string.Format(ServicosEolConstants.URL_ALUNOS_TURMAS_ANOS_LETIVOS_HISTORICO_FILTRAR_SITUACAO, request.CodigoAluno, request.AnoLetivo, request.Historico, request.FiltrarSituacao, request.TipoTurma), cancellationToken);
+
+            var json = await resposta.Content.ReadAsStringAsync(cancellationToken);
 
             if (resposta.IsSuccessStatusCode)
             {
-                var json = await resposta.Content.ReadAsStringAsync(cancellationToken);
-                alunos = JsonConvert.DeserializeObject<List<AlunoPorTurmaResposta>>(json);
+                return JsonConvert.DeserializeObject<List<AlunoPorTurmaResposta>>(json);
+
+            } else if (resposta.StatusCode == HttpStatusCode.NotFound || resposta.StatusCode == HttpStatusCode.NoContent)
+            {
+                return Enumerable.Empty<AlunoPorTurmaResposta>();
             }
 
-            return alunos;
+            throw new Exception(json);
         }
     }
 }