Skip to content

Commit a069669

Browse files
I-RzR-II-RzR-I
authored
Merge pull request #2 from I-RzR-I/feature/LibUpdateAndCodeImprovements
Update reference package version and code improvs
2 parents ddcc8e9 + 0df50f1 commit a069669

16 files changed

+371
-56
lines changed

‎docs/CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,7 @@
11
### **v.1.0.1.0546**
22
-> Update reference package version.
3+
4+
### **v1.0.2.1322**
5+
-> Update reference package version.
6+
-> Adjust code to be more readable.
7+
-> Add new internal extensions.

‎src/AggregatedGenericResultMessage.Web/AggregatedGenericResultMessage.Web.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
<Compile Include="..\shared\GeneralAssemblyInfo.cs" Link="Properties\GeneralAssemblyInfo.cs" />
4141
</ItemGroup>
4242
<ItemGroup>
43-
<PackageReference Include="AggregatedGenericResultMessage" Version="1.2.1" />
43+
<PackageReference Include="AggregatedGenericResultMessage" Version="1.2.2.2040" />
4444
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
4545
</ItemGroup>
4646

‎src/AggregatedGenericResultMessage.Web/Extensions/ActionResult/ResultToActionResult.cs

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
using System.Linq;
2020
using AggregatedGenericResultMessage.Abstractions;
21+
using AggregatedGenericResultMessage.Web.Extensions.Internal.DataType;
2122
using Microsoft.AspNetCore.Http;
2223
using Microsoft.AspNetCore.Mvc;
2324

@@ -42,7 +43,7 @@ public static partial class ToActionResult
4243
/// </returns>
4344
/// <remarks></remarks>
4445
public static Microsoft.AspNetCore.Mvc.ActionResult AsActionResult(this Result result)
45-
=> result.IsSuccess
46+
=> result.IsSuccess.IsTrue()
4647
? (Microsoft.AspNetCore.Mvc.ActionResult)new StatusCodeResult(StatusCodes.Status204NoContent)
4748
: new ObjectResult(result.GetFirstMessage()) { StatusCode = StatusCodes.Status400BadRequest };
4849

@@ -57,7 +58,7 @@ public static Microsoft.AspNetCore.Mvc.ActionResult AsActionResult(this Result r
5758
/// </returns>
5859
/// <remarks></remarks>
5960
public static IActionResult AsIActionResult(this Result result)
60-
=> result.IsSuccess
61+
=> result.IsSuccess.IsTrue()
6162
? (IActionResult)new StatusCodeResult(StatusCodes.Status204NoContent)
6263
: new ObjectResult(result.GetFirstMessage()) { StatusCode = StatusCodes.Status400BadRequest };
6364

@@ -73,7 +74,7 @@ public static IActionResult AsIActionResult(this Result result)
7374
/// <typeparam name="T">Common result type</typeparam>
7475
/// <remarks></remarks>
7576
public static Microsoft.AspNetCore.Mvc.ActionResult AsActionResult<T>(this Result<T> result)
76-
=> result.IsSuccess
77+
=> result.IsSuccess.IsTrue()
7778
? new ObjectResult(result.Response) { StatusCode = StatusCodes.Status200OK }
7879
: new ObjectResult(result.GetFirstMessage()) { StatusCode = StatusCodes.Status400BadRequest };
7980

@@ -89,7 +90,7 @@ public static Microsoft.AspNetCore.Mvc.ActionResult AsActionResult<T>(this Resul
8990
/// <typeparam name="T">Common result type</typeparam>
9091
/// <remarks></remarks>
9192
public static IActionResult AsIActionResult<T>(this Result<T> result)
92-
=> result.IsSuccess
93+
=> result.IsSuccess.IsTrue()
9394
? new ObjectResult(result.Response) { StatusCode = StatusCodes.Status200OK }
9495
: new ObjectResult(result.GetFirstMessage()) { StatusCode = StatusCodes.Status400BadRequest };
9596

@@ -104,7 +105,7 @@ public static IActionResult AsIActionResult<T>(this Result<T> result)
104105
/// </returns>
105106
/// <remarks></remarks>
106107
public static Microsoft.AspNetCore.Mvc.ActionResult AsActionResult(this IResult result)
107-
=> result.IsSuccess
108+
=> result.IsSuccess.IsTrue()
108109
? (Microsoft.AspNetCore.Mvc.ActionResult)new StatusCodeResult(StatusCodes.Status204NoContent)
109110
: new ObjectResult(result.Messages.FirstOrDefault()?.Message) { StatusCode = StatusCodes.Status400BadRequest };
110111

@@ -119,7 +120,7 @@ public static Microsoft.AspNetCore.Mvc.ActionResult AsActionResult(this IResult
119120
/// </returns>
120121
/// <remarks></remarks>
121122
public static IActionResult AsIActionResult(this IResult result)
122-
=> result.IsSuccess
123+
=> result.IsSuccess.IsTrue()
123124
? (IActionResult)new StatusCodeResult(StatusCodes.Status204NoContent)
124125
: new ObjectResult(result.Messages.FirstOrDefault()?.Message) { StatusCode = StatusCodes.Status400BadRequest };
125126

@@ -135,7 +136,7 @@ public static IActionResult AsIActionResult(this IResult result)
135136
/// <typeparam name="T">Common result type</typeparam>
136137
/// <remarks></remarks>
137138
public static Microsoft.AspNetCore.Mvc.ActionResult AsActionResult<T>(this IResult<T> result)
138-
=> result.IsSuccess
139+
=> result.IsSuccess.IsTrue()
139140
? new ObjectResult(result.Response) { StatusCode = StatusCodes.Status200OK }
140141
: new ObjectResult(result.Messages.FirstOrDefault()?.Message) { StatusCode = StatusCodes.Status400BadRequest };
141142

@@ -151,7 +152,7 @@ public static Microsoft.AspNetCore.Mvc.ActionResult AsActionResult<T>(this IResu
151152
/// <typeparam name="T">Common result type</typeparam>
152153
/// <remarks></remarks>
153154
public static IActionResult AsIActionResult<T>(this IResult<T> result)
154-
=> result.IsSuccess
155+
=> result.IsSuccess.IsTrue()
155156
? new ObjectResult(result.Response) { StatusCode = StatusCodes.Status200OK }
156157
: new ObjectResult(result.Messages.FirstOrDefault()?.Message) { StatusCode = StatusCodes.Status400BadRequest };
157158
}

‎src/AggregatedGenericResultMessage.Web/Extensions/ActionResult/ResultToActionResultByCode.cs

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@
1919
using System.Linq;
2020
using System.Net;
2121
using AggregatedGenericResultMessage.Abstractions;
22-
using AggregatedGenericResultMessage.Web.Extensions.Internal;
22+
using AggregatedGenericResultMessage.Web.Extensions.Internal.DataType;
23+
using AggregatedGenericResultMessage.Web.Extensions.Internal.Result;
2324
using AggregatedGenericResultMessage.Web.Helpers;
2425
using Microsoft.AspNetCore.Mvc;
2526

@@ -46,10 +47,10 @@ public static Microsoft.AspNetCore.Mvc.ActionResult AsActionResult(this Result r
4647
{
4748
_httpStatusCode = statusCode.ToInt();
4849
var statusCodeCheck = CheckResultStatusHelper.CheckStatusCode(statusCode);
49-
50-
return !statusCodeCheck.IsSuccess || statusCodeCheck.Response.IsError
50+
51+
return statusCodeCheck.IsNoSuccess()
5152
? new BadRequestObjectResult(result.GetFirstMessage()) { StatusCode = _httpStatusCode }
52-
: result.IsSuccess && statusCodeCheck.Response.IsSuccess
53+
: result.IsWithSuccess(statusCodeCheck)
5354
? (Microsoft.AspNetCore.Mvc.ActionResult)new StatusCodeResult(_httpStatusCode)
5455
: new ObjectResult(result.GetFirstMessage()) { StatusCode = _httpStatusCode };
5556
}
@@ -66,9 +67,9 @@ public static IActionResult AsIActionResult(this Result result, HttpStatusCode s
6667
_httpStatusCode = statusCode.ToInt();
6768
var statusCodeCheck = CheckResultStatusHelper.CheckStatusCode(statusCode);
6869

69-
return !statusCodeCheck.IsSuccess || statusCodeCheck.Response.IsError
70+
return statusCodeCheck.IsNoSuccess()
7071
? new BadRequestObjectResult(result.GetFirstMessage()) { StatusCode = _httpStatusCode }
71-
: result.IsSuccess && statusCodeCheck.Response.IsSuccess
72+
: result.IsWithSuccess(statusCodeCheck)
7273
? (Microsoft.AspNetCore.Mvc.ActionResult)new StatusCodeResult(_httpStatusCode)
7374
: new ObjectResult(result.GetFirstMessage()) { StatusCode = _httpStatusCode };
7475
}
@@ -85,10 +86,10 @@ public static Microsoft.AspNetCore.Mvc.ActionResult AsActionResult<T>(this Resul
8586
{
8687
_httpStatusCode = statusCode.ToInt();
8788
var statusCodeCheck = CheckResultStatusHelper.CheckStatusCode(statusCode);
88-
89-
return !statusCodeCheck.IsSuccess || statusCodeCheck.Response.IsError
89+
90+
return statusCodeCheck.IsNoSuccess()
9091
? new BadRequestObjectResult(result.GetFirstMessage()) { StatusCode = _httpStatusCode }
91-
: result.IsSuccess && statusCodeCheck.Response.IsSuccess
92+
: result.IsWithSuccess(statusCodeCheck)
9293
? new ObjectResult(result.Response) { StatusCode = _httpStatusCode }
9394
: new ObjectResult(result.GetFirstMessage()) { StatusCode = _httpStatusCode };
9495
}
@@ -105,10 +106,10 @@ public static IActionResult AsIActionResult<T>(this Result<T> result, HttpStatus
105106
{
106107
_httpStatusCode = statusCode.ToInt();
107108
var statusCodeCheck = CheckResultStatusHelper.CheckStatusCode(statusCode);
108-
109-
return !statusCodeCheck.IsSuccess || statusCodeCheck.Response.IsError
109+
110+
return statusCodeCheck.IsNoSuccess()
110111
? new BadRequestObjectResult(result.GetFirstMessage()) { StatusCode = _httpStatusCode }
111-
: result.IsSuccess && statusCodeCheck.Response.IsSuccess
112+
: result.IsWithSuccess(statusCodeCheck)
112113
? new ObjectResult(result.Response) { StatusCode = _httpStatusCode }
113114
: new ObjectResult(result.GetFirstMessage()) { StatusCode = _httpStatusCode };
114115
}
@@ -124,10 +125,10 @@ public static Microsoft.AspNetCore.Mvc.ActionResult AsActionResult(this IResult
124125
{
125126
_httpStatusCode = statusCode.ToInt();
126127
var statusCodeCheck = CheckResultStatusHelper.CheckStatusCode(statusCode);
127-
128-
return !statusCodeCheck.IsSuccess || statusCodeCheck.Response.IsError
128+
129+
return statusCodeCheck.IsNoSuccess()
129130
? new BadRequestObjectResult(result.Messages.FirstOrDefault()?.Message) { StatusCode = _httpStatusCode }
130-
: result.IsSuccess && statusCodeCheck.Response.IsSuccess
131+
: result.IsWithSuccess(statusCodeCheck)
131132
? (Microsoft.AspNetCore.Mvc.ActionResult)new StatusCodeResult(_httpStatusCode)
132133
: new ObjectResult(result.Messages.FirstOrDefault()?.Message) { StatusCode = _httpStatusCode };
133134
}
@@ -143,10 +144,10 @@ public static IActionResult AsIActionResult(this IResult result, HttpStatusCode
143144
{
144145
_httpStatusCode = statusCode.ToInt();
145146
var statusCodeCheck = CheckResultStatusHelper.CheckStatusCode(statusCode);
146-
147-
return !statusCodeCheck.IsSuccess || statusCodeCheck.Response.IsError
147+
148+
return statusCodeCheck.IsNoSuccess()
148149
? new BadRequestObjectResult(result.Messages.FirstOrDefault()?.Message) { StatusCode = _httpStatusCode }
149-
: result.IsSuccess && statusCodeCheck.Response.IsSuccess
150+
: result.IsWithSuccess(statusCodeCheck)
150151
? (IActionResult)new StatusCodeResult(_httpStatusCode)
151152
: new ObjectResult(result.Messages.FirstOrDefault()?.Message) { StatusCode = _httpStatusCode };
152153
}
@@ -163,10 +164,10 @@ public static Microsoft.AspNetCore.Mvc.ActionResult AsActionResult<T>(this IResu
163164
{
164165
_httpStatusCode = statusCode.ToInt();
165166
var statusCodeCheck = CheckResultStatusHelper.CheckStatusCode(statusCode);
166-
167-
return !statusCodeCheck.IsSuccess || statusCodeCheck.Response.IsError
167+
168+
return statusCodeCheck.IsNoSuccess()
168169
? new BadRequestObjectResult(result.Messages.FirstOrDefault()?.Message) { StatusCode = _httpStatusCode }
169-
: result.IsSuccess && statusCodeCheck.Response.IsSuccess
170+
: result.IsWithSuccess(statusCodeCheck)
170171
? new ObjectResult(result.Response) { StatusCode = _httpStatusCode }
171172
: new ObjectResult(result.Messages.FirstOrDefault()?.Message) { StatusCode = _httpStatusCode };
172173
}
@@ -183,10 +184,10 @@ public static IActionResult AsIActionResult<T>(this IResult<T> result, HttpStatu
183184
{
184185
_httpStatusCode = statusCode.ToInt();
185186
var statusCodeCheck = CheckResultStatusHelper.CheckStatusCode(statusCode);
186-
187-
return !statusCodeCheck.IsSuccess || statusCodeCheck.Response.IsError
187+
188+
return statusCodeCheck.IsNoSuccess()
188189
? new BadRequestObjectResult(result.Messages.FirstOrDefault()?.Message) { StatusCode = _httpStatusCode }
189-
: result.IsSuccess && statusCodeCheck.Response.IsSuccess
190+
: result.IsWithSuccess(statusCodeCheck)
190191
? new ObjectResult(result.Response) { StatusCode = _httpStatusCode }
191192
: new ObjectResult(result.Messages.FirstOrDefault()?.Message) { StatusCode = _httpStatusCode };
192193
}

‎src/AggregatedGenericResultMessage.Web/Extensions/ActionResult/ResultToObjectResult.cs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@
1818

1919
using System.Net;
2020
using AggregatedGenericResultMessage.Abstractions;
21-
using AggregatedGenericResultMessage.Web.Extensions.Internal;
21+
using AggregatedGenericResultMessage.Web.Extensions.Internal.DataType;
22+
using AggregatedGenericResultMessage.Web.Extensions.Internal.Http;
2223
using Microsoft.AspNetCore.Http;
2324
using Microsoft.AspNetCore.Mvc;
2425

@@ -62,7 +63,7 @@ public static ObjectResult AsSuccessObjectResult(this IResult result)
6263
/// <typeparam name="T">Common result type</typeparam>
6364
/// <remarks></remarks>
6465
public static ObjectResult AsSuccessObjectResult<T>(this Result<T> result, int statusCode)
65-
=> statusCode == StatusCodes.Status204NoContent || result.IsNull()
66+
=> statusCode.IsSuccessHttpStatus() || result.IsNull()
6667
? new ObjectResult(null) { StatusCode = statusCode }
6768
: new ObjectResult(result.Response) { StatusCode = statusCode };
6869

@@ -75,7 +76,7 @@ public static ObjectResult AsSuccessObjectResult<T>(this Result<T> result, int s
7576
/// <typeparam name="T">Common result type</typeparam>
7677
/// <remarks></remarks>
7778
public static ObjectResult AsSuccessObjectResult<T>(this Result<T> result, HttpStatusCode statusCode)
78-
=> statusCode.ToInt() == StatusCodes.Status204NoContent || result.IsNull()
79+
=> statusCode.IsOkNoContent() || result.IsNull()
7980
? new ObjectResult(null) { StatusCode = statusCode.ToInt() }
8081
: new ObjectResult(result.Response) { StatusCode = statusCode.ToInt() };
8182

@@ -88,7 +89,7 @@ public static ObjectResult AsSuccessObjectResult<T>(this Result<T> result, HttpS
8889
/// <typeparam name="T">Common result type</typeparam>
8990
/// <remarks></remarks>
9091
public static ObjectResult AsSuccessObjectResult<T>(this IResult<T> result, int statusCode)
91-
=> statusCode == StatusCodes.Status204NoContent || result.IsNull()
92+
=> statusCode.IsSuccessHttpNoContentStatus() || result.IsNull()
9293
? new ObjectResult(null) { StatusCode = statusCode }
9394
: new ObjectResult(result.Response) { StatusCode = statusCode };
9495

@@ -101,7 +102,7 @@ public static ObjectResult AsSuccessObjectResult<T>(this IResult<T> result, int
101102
/// <typeparam name="T">Common result type</typeparam>
102103
/// <remarks></remarks>
103104
public static ObjectResult AsSuccessObjectResult<T>(this IResult<T> result, HttpStatusCode statusCode)
104-
=> statusCode.ToInt() == StatusCodes.Status204NoContent
105+
=> statusCode.IsOkNoContent()
105106
? new ObjectResult(null) { StatusCode = statusCode.ToInt() }
106107
: new ObjectResult(result.Response) { StatusCode = statusCode.ToInt() };
107108
}

‎src/AggregatedGenericResultMessage.Web/Extensions/Internal/DataType/BoolExtensions.cs

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
// ***********************************************************************
2+
// Assembly : RzR.Shared.ResultMessage.AggregatedGenericResultMessage.Web
3+
// Author : RzR
4+
// Created On : 2023-10-11 17:14
5+
//
6+
// Last Modified By : RzR
7+
// Last Modified On : 2023-10-11 17:14
8+
// ***********************************************************************
9+
// <copyright file="BoolExtensions.cs" company="">
10+
// Copyright (c) RzR. All rights reserved.
11+
// </copyright>
12+
//
13+
// <summary>
14+
// </summary>
15+
// ***********************************************************************
16+
17+
namespace AggregatedGenericResultMessage.Web.Extensions.Internal.DataType
18+
{
19+
/// <summary>
20+
/// Boolean extensions
21+
/// </summary>
22+
internal static class BoolExtensions
23+
{
24+
/// <summary>
25+
/// Check if source value is equals with true
26+
/// </summary>
27+
/// <param name="source">Source bool value to be checked</param>
28+
/// <returns></returns>
29+
internal static bool IsTrue(this bool source)
30+
=> source.Equals(true);
31+
32+
/// <summary>
33+
/// Check if source value is equals with true
34+
/// </summary>
35+
/// <param name="source">Source bool value to be checked</param>
36+
/// <returns></returns>
37+
internal static bool IsTrue(this bool? source)
38+
=> source == true;
39+
40+
/// <summary>
41+
/// Check if source value is equals with false
42+
/// </summary>
43+
/// <param name="source">Source bool value to be checked</param>
44+
/// <returns></returns>
45+
internal static bool IsFalse(this bool source)
46+
=> source != true;
47+
48+
/// <summary>
49+
/// Check if source value is equals with false
50+
/// </summary>
51+
/// <param name="source">Source bool value to be checked</param>
52+
/// <returns></returns>
53+
internal static bool IsFalse(this bool? source)
54+
=> source != true;
55+
}
56+
}

‎src/AggregatedGenericResultMessage.Web/Extensions/Internal/EnumExtensions.cs renamed to ‎src/AggregatedGenericResultMessage.Web/Extensions/Internal/DataType/EnumExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
#endregion
2323

24-
namespace AggregatedGenericResultMessage.Web.Extensions.Internal
24+
namespace AggregatedGenericResultMessage.Web.Extensions.Internal.DataType
2525
{
2626
/// <summary>
2727
/// Enum extensions

‎src/AggregatedGenericResultMessage.Web/Extensions/Internal/DataType/IntExtensions.cs

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
// ***********************************************************************
2+
// Assembly : RzR.Shared.ResultMessage.AggregatedGenericResultMessage.Web
3+
// Author : RzR
4+
// Created On : 2023-10-11 17:41
5+
//
6+
// Last Modified By : RzR
7+
// Last Modified On : 2023-10-11 17:41
8+
// ***********************************************************************
9+
// <copyright file="IntExtensions.cs" company="">
10+
// Copyright (c) RzR. All rights reserved.
11+
// </copyright>
12+
//
13+
// <summary>
14+
// </summary>
15+
// ***********************************************************************
16+
17+
using Microsoft.AspNetCore.Http;
18+
19+
namespace AggregatedGenericResultMessage.Web.Extensions.Internal.DataType
20+
{
21+
/// <summary>
22+
/// Int32 extensions
23+
/// </summary>
24+
internal static class IntExtensions
25+
{
26+
/// <summary>
27+
/// Check if current HTTP status code is success (OK | NoContent)
28+
/// </summary>
29+
/// <param name="statusCode">Current HTTP status code</param>
30+
/// <returns></returns>
31+
/// <remarks>Status200OK | Status204NoContent</remarks>
32+
internal static bool IsSuccessHttpStatus(this int statusCode)
33+
=> statusCode == StatusCodes.Status200OK || statusCode == StatusCodes.Status204NoContent;
34+
35+
/// <summary>
36+
/// Check if current HTTP status code is success (NoContent)
37+
/// </summary>
38+
/// <param name="statusCode">Current HTTP status code</param>
39+
/// <returns></returns>
40+
/// <remarks>Status204NoContent</remarks>
41+
internal static bool IsSuccessHttpNoContentStatus(this int statusCode)
42+
=> statusCode == StatusCodes.Status204NoContent;
43+
44+
/// <summary>
45+
/// Check if current HTTP status code is success (OK)
46+
/// </summary>
47+
/// <param name="statusCode">Current HTTP status code</param>
48+
/// <returns></returns>
49+
/// <remarks>Status200OK</remarks>
50+
internal static bool IsSuccessHttpOkStatus(this int statusCode)
51+
=> statusCode == StatusCodes.Status200OK;
52+
}
53+
}

‎src/AggregatedGenericResultMessage.Web/Extensions/Internal/NullExtensions.cs renamed to ‎src/AggregatedGenericResultMessage.Web/Extensions/Internal/DataType/NullExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
using CodeSource;
1818

19-
namespace AggregatedGenericResultMessage.Web.Extensions.Internal
19+
namespace AggregatedGenericResultMessage.Web.Extensions.Internal.DataType
2020
{
2121
/// <summary>
2222
/// Null extensions

0 commit comments

Comments
 (0)