From b67dba6363ceeeb751717c7efe61008ca7fefcca Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Wed, 5 Aug 2020 19:03:20 +0000 Subject: [PATCH] --- server/AyaNova/ControllerHelpers/ApiServerState.cs | 9 +++++---- .../AyaNova/Controllers/NotifySubscriptionController.cs | 2 +- server/AyaNova/Controllers/SearchController.cs | 2 +- server/AyaNova/Controllers/UserController.cs | 4 ++-- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/server/AyaNova/ControllerHelpers/ApiServerState.cs b/server/AyaNova/ControllerHelpers/ApiServerState.cs index 5d5c53cd..cc71122c 100644 --- a/server/AyaNova/ControllerHelpers/ApiServerState.cs +++ b/server/AyaNova/ControllerHelpers/ApiServerState.cs @@ -101,10 +101,11 @@ namespace AyaNova.Api.ControllerHelpers } else { - if (_currentState == ServerState.Closed) - return $"{ AyaNova.Biz.TranslationBiz.GetDefaultTranslationAsync("ErrorAPI2000").Result}\r\n{_reason}"; - else //opsonly - return $"{ AyaNova.Biz.TranslationBiz.GetDefaultTranslationAsync("ErrorAPI2001").Result}\r\n{_reason}"; + return _reason; + // if (_currentState == ServerState.Closed) + // return $"{ AyaNova.Biz.TranslationBiz.GetDefaultTranslationAsync("ErrorAPI2000").Result}\r\n{_reason}"; + // else //opsonly + // return $"{ AyaNova.Biz.TranslationBiz.GetDefaultTranslationAsync("ErrorAPI2001").Result}\r\n{_reason}"; } } } diff --git a/server/AyaNova/Controllers/NotifySubscriptionController.cs b/server/AyaNova/Controllers/NotifySubscriptionController.cs index 725ed6c9..5771fb5b 100644 --- a/server/AyaNova/Controllers/NotifySubscriptionController.cs +++ b/server/AyaNova/Controllers/NotifySubscriptionController.cs @@ -155,7 +155,7 @@ namespace AyaNova.Api.Controllers [HttpGet("list")] public async Task GetQueue() { - if (serverState.IsClosed) + if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); //NOTE: in future if getting list for another user should just duplicate this method but add the parameter for user id diff --git a/server/AyaNova/Controllers/SearchController.cs b/server/AyaNova/Controllers/SearchController.cs index 472c8cc8..02e795b5 100644 --- a/server/AyaNova/Controllers/SearchController.cs +++ b/server/AyaNova/Controllers/SearchController.cs @@ -80,7 +80,7 @@ namespace AyaNova.Api.Controllers [HttpGet("info/{ayaType}/{id}")] public async Task GetInfo([FromRoute] AyaType ayaType, [FromRoute] long id, [FromQuery] string phrase, [FromQuery] int max = 80) { - if (serverState.IsClosed) + if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); if (!Authorized.HasReadFullRole(HttpContext.Items, ayaType)) diff --git a/server/AyaNova/Controllers/UserController.cs b/server/AyaNova/Controllers/UserController.cs index f27ff3be..c422c9db 100644 --- a/server/AyaNova/Controllers/UserController.cs +++ b/server/AyaNova/Controllers/UserController.cs @@ -270,7 +270,7 @@ namespace AyaNova.Api.Controllers [HttpGet("list")] public async Task GetInsideUserList() { - if (serverState.IsClosed) + if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); if (!Authorized.HasReadFullRole(HttpContext.Items, AyaType.User)) @@ -301,7 +301,7 @@ namespace AyaNova.Api.Controllers [HttpGet("outlist")] public async Task GetOutsideUserList() { - if (serverState.IsClosed) + if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); if (!Authorized.HasReadFullRole(HttpContext.Items, AyaType.Customer))