saherelm/xFileService
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

last refactoring ...

Browse Source
This commit is contained in:
saherelm
2025-12-10 15:27:34 +03:30
parent 5a76acbc67
commit 0b033ab1b9
4 changed files with 171 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Controllers/XFileServiceControllerBase.cs
+53 -24
View File
@@ -51,13 +51,13 @@ namespace xFileService.Controllers
/// <summary> /// <summary>
/// Attach Tag to Specified Model ... /// Attach Tag to Specified Model ...
/// </summary> /// </summary>
/// <param name="tag"></param>
/// <param name="id"></param> /// <param name="id"></param>
/// <param name="tag"></param>
/// <returns></returns> /// <returns></returns>
[HttpGet("Tags/Attach")] [HttpPost("{id}/Tags/Attach")]
public virtual async Task<ActionResult> TagAttach( public virtual async Task<ActionResult> AttachTag(
[FromQuery] string tag, [FromRoute] Guid id,
[FromQuery] Guid id [FromQuery] string tag
) )
{ {
// //
@@ -72,7 +72,7 @@ namespace xFileService.Controllers
var userId = userInfo.UserId; var userId = userInfo.UserId;
// //
await FileProvider.TagAttach( await FileProvider.AttachTag(
id: id, id: id,
tag: tag, tag: tag,
userInfo: userInfo, userInfo: userInfo,
@@ -96,10 +96,10 @@ namespace xFileService.Controllers
/// <param name="tag"></param> /// <param name="tag"></param>
/// <param name="id"></param> /// <param name="id"></param>
/// <returns></returns> /// <returns></returns>
[HttpGet("Tags/Detach")] [HttpDelete("{id}/Tags/Detach")]
public virtual async Task<ActionResult> TagDetach( public virtual async Task<ActionResult> DetachTag(
[FromQuery] string tag, [FromRoute] Guid id,
[FromQuery] Guid id [FromQuery] string tag
) )
{ {
// //
@@ -114,7 +114,7 @@ namespace xFileService.Controllers
var userId = userInfo.UserId; var userId = userInfo.UserId;
// //
await FileProvider.TagDetach( await FileProvider.DetachTag(
id: id, id: id,
tag: tag, tag: tag,
userInfo: userInfo, userInfo: userInfo,
@@ -138,10 +138,10 @@ namespace xFileService.Controllers
/// <param name="tags"></param> /// <param name="tags"></param>
/// <param name="id"></param> /// <param name="id"></param>
/// <returns></returns> /// <returns></returns>
[HttpGet("Tags/AttachMany")] [HttpPost("{id}/Tags/AttachMany")]
public virtual async Task<ActionResult> TagsAttach( public virtual async Task<ActionResult> AttachTags(
[FromQuery] string tags, [FromRoute] Guid id,
[FromQuery] Guid id [FromQuery] string tags
) )
{ {
// //
@@ -159,7 +159,7 @@ namespace xFileService.Controllers
var userId = userInfo.UserId; var userId = userInfo.UserId;
// //
await FileProvider.TagsAttach( await FileProvider.AttachTags(
id: id, id: id,
tags: tagsList, tags: tagsList,
userInfo: userInfo, userInfo: userInfo,
@@ -183,10 +183,10 @@ namespace xFileService.Controllers
/// <param name="tags"></param> /// <param name="tags"></param>
/// <param name="id"></param> /// <param name="id"></param>
/// <returns></returns> /// <returns></returns>
[HttpGet("Tags/DetachMany")] [HttpDelete("{id}/Tags/DetachMany")]
public virtual async Task<ActionResult> TagsDetach( public virtual async Task<ActionResult> DetachTags(
[FromQuery] string tags, [FromRoute] Guid id,
[FromQuery] Guid id [FromQuery] string tags
) )
{ {
// //
@@ -204,7 +204,7 @@ namespace xFileService.Controllers
var userId = userInfo.UserId; var userId = userInfo.UserId;
// //
await FileProvider.TagsDetach( await FileProvider.DetachTags(
id: id, id: id,
tags: tagsList, tags: tagsList,
userInfo: userInfo, userInfo: userInfo,
@@ -221,6 +221,35 @@ namespace xFileService.Controllers
return result; return result;
} }
} }
/// <summary>
/// Retrieve Tags of Specified File ...
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
[HttpGet("{id}/Tags")]
public virtual async Task<ActionResult<IEnumerable<string>>> GetTags(
[FromRoute] Guid id
)
{
//
// Do ...
try
{
//
var result = await FileProvider.GetTags(id);
//
return Ok(result
.ToDynamicObject());
}
catch (Exception ex)
{
//
var result = GetExceptionActionResult(ex);
return result;
}
}
#endregion #endregion
// //
@@ -342,7 +371,7 @@ namespace xFileService.Controllers
/// </summary> /// </summary>
/// <param name="files"></param> /// <param name="files"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost("Upload")] [HttpPost("")]
[RequestSizeLimit(966_367_641)] [RequestSizeLimit(966_367_641)]
public virtual async Task<ActionResult<IEnumerable<XFileDto>>> Upload( public virtual async Task<ActionResult<IEnumerable<XFileDto>>> Upload(
[FromForm] IFormFileCollection files [FromForm] IFormFileCollection files
@@ -384,7 +413,7 @@ namespace xFileService.Controllers
/// <param name="ids"></param> /// <param name="ids"></param>
/// <returns></returns> /// <returns></returns>
/// [HttpDelete("Remove")] /// [HttpDelete("Remove")]
[HttpDelete("Remove")] [HttpDelete("")]
public virtual async Task<ActionResult<IEnumerable<Guid>>> Remove( public virtual async Task<ActionResult<IEnumerable<Guid>>> Remove(
[FromQuery] string ids [FromQuery] string ids
) { ) {
@@ -507,7 +536,7 @@ namespace xFileService.Controllers
/// </summary> /// </summary>
/// <param name="query"></param> /// <param name="query"></param>
/// <returns></returns> /// <returns></returns>
[HttpGet("Owned/Query")] [HttpGet("Query/Owned")]
public virtual async Task<ActionResult<XQueryResult<XFileDto>>> QueryOwned( public virtual async Task<ActionResult<XQueryResult<XFileDto>>> QueryOwned(
[FromQuery] XQuery query [FromQuery] XQuery query
) { ) {
Interfaces/IXFileProvider.cs
+20 -13
View File
@@ -59,14 +59,14 @@ namespace xFileService.Interfaces
/// <summary> /// <summary>
/// Attach Tag to Specified File ... /// Attach Tag to Specified File ...
/// </summary> /// </summary>
/// <param name="tag"></param>
/// <param name="id"></param> /// <param name="id"></param>
/// <param name="tag"></param>
/// <param name="userInfo"></param> /// <param name="userInfo"></param>
/// <param name="connectionId"></param> /// <param name="connectionId"></param>
/// <returns></returns> /// <returns></returns>
Task TagAttach( Task AttachTag(
string tag,
Guid id, Guid id,
string tag,
XUserClaimsInfoDto userInfo = null, XUserClaimsInfoDto userInfo = null,
string connectionId = null string connectionId = null
); );
@@ -74,14 +74,14 @@ namespace xFileService.Interfaces
/// <summary> /// <summary>
/// Detach Tag fro Specified File ... /// Detach Tag fro Specified File ...
/// </summary> /// </summary>
/// <param name="tag"></param>
/// <param name="id"></param> /// <param name="id"></param>
/// <param name="tag"></param>
/// <param name="userInfo"></param> /// <param name="userInfo"></param>
/// <param name="connectionId"></param> /// <param name="connectionId"></param>
/// <returns></returns> /// <returns></returns>
Task TagDetach( Task DetachTag(
string tag,
Guid id, Guid id,
string tag,
XUserClaimsInfoDto userInfo = null, XUserClaimsInfoDto userInfo = null,
string connectionId = null string connectionId = null
); );
@@ -89,14 +89,14 @@ namespace xFileService.Interfaces
/// <summary> /// <summary>
/// Attach Tags for Specified File ... /// Attach Tags for Specified File ...
/// </summary> /// </summary>
/// <param name="tags"></param>
/// <param name="id"></param> /// <param name="id"></param>
/// <param name="tags"></param>
/// <param name="userInfo"></param> /// <param name="userInfo"></param>
/// <param name="connectionId"></param> /// <param name="connectionId"></param>
/// <returns></returns> /// <returns></returns>
Task TagsAttach( Task AttachTags(
IEnumerable<string> tags,
Guid id, Guid id,
IEnumerable<string> tags,
XUserClaimsInfoDto userInfo = null, XUserClaimsInfoDto userInfo = null,
string connectionId = null string connectionId = null
); );
@@ -104,14 +104,14 @@ namespace xFileService.Interfaces
/// <summary> /// <summary>
/// Detach Tags for Specified File ... /// Detach Tags for Specified File ...
/// </summary> /// </summary>
/// <param name="tags"></param>
/// <param name="id"></param> /// <param name="id"></param>
/// <param name="tags"></param>
/// <param name="userInfo"></param> /// <param name="userInfo"></param>
/// <param name="connectionId"></param> /// <param name="connectionId"></param>
/// <returns></returns> /// <returns></returns>
Task TagsDetach( Task DetachTags(
IEnumerable<string> tags,
Guid id, Guid id,
IEnumerable<string> tags,
XUserClaimsInfoDto userInfo = null, XUserClaimsInfoDto userInfo = null,
string connectionId = null string connectionId = null
); );
@@ -123,11 +123,18 @@ namespace xFileService.Interfaces
/// <param name="userInfo"></param> /// <param name="userInfo"></param>
/// <param name="connectionId"></param> /// <param name="connectionId"></param>
/// <returns></returns> /// <returns></returns>
Task TagsDetach( Task DetachTags(
Guid id, Guid id,
XUserClaimsInfoDto userInfo = null, XUserClaimsInfoDto userInfo = null,
string connectionId = null string connectionId = null
); );
/// <summary>
/// Get Specified Model's Tag ...
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
Task<IEnumerable<string>> GetTags(Guid id);
#endregion #endregion
// //
Interfaces/IXFileServiceControllerActions.cs
+29 -20
View File
@@ -17,12 +17,12 @@ namespace xFileService.Interfaces
/// <summary> /// <summary>
/// Attach Tag to Specified Model ... /// Attach Tag to Specified Model ...
/// </summary> /// </summary>
/// <param name="tag"></param>
/// <param name="id"></param> /// <param name="id"></param>
/// <param name="tag"></param>
/// <returns></returns> /// <returns></returns>
Task<ActionResult> TagAttach( Task<ActionResult> AttachTag(
[FromQuery] string tag, [FromRoute] Guid id,
[FromQuery] Guid id [FromQuery] string tag
); );
/// <summary> /// <summary>
@@ -31,9 +31,9 @@ namespace xFileService.Interfaces
/// <param name="tag"></param> /// <param name="tag"></param>
/// <param name="id"></param> /// <param name="id"></param>
/// <returns></returns> /// <returns></returns>
Task<ActionResult> TagDetach( Task<ActionResult> DetachTag(
[FromQuery] string tag, [FromRoute] Guid id,
[FromQuery] Guid id [FromQuery] string tag
); );
/// <summary> /// <summary>
@@ -42,9 +42,9 @@ namespace xFileService.Interfaces
/// <param name="tags"></param> /// <param name="tags"></param>
/// <param name="id"></param> /// <param name="id"></param>
/// <returns></returns> /// <returns></returns>
Task<ActionResult> TagsAttach( Task<ActionResult> AttachTags(
[FromQuery] string tags, [FromRoute] Guid id,
[FromQuery] Guid id [FromQuery] string tags
); );
/// <summary> /// <summary>
@@ -53,9 +53,18 @@ namespace xFileService.Interfaces
/// <param name="tags"></param> /// <param name="tags"></param>
/// <param name="id"></param> /// <param name="id"></param>
/// <returns></returns> /// <returns></returns>
Task<ActionResult> TagsDetach( Task<ActionResult> DetachTags(
[FromQuery] string tags, [FromRoute] Guid id,
[FromQuery] Guid id [FromQuery] string tags
);
/// <summary>
/// Retrieve Tags of Specified File ...
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
Task<ActionResult<IEnumerable<string>>> GetTags(
[FromRoute] Guid id
); );
#endregion #endregion
@@ -95,8 +104,8 @@ namespace xFileService.Interfaces
/// <returns></returns> /// <returns></returns>
Task<ActionResult> Download( Task<ActionResult> Download(
[FromRoute] string name [FromRoute] string name
); );
/// <summary> /// <summary>
/// Upload Files ... /// Upload Files ...
/// </summary> /// </summary>
@@ -104,8 +113,8 @@ namespace xFileService.Interfaces
/// <returns></returns> /// <returns></returns>
Task<ActionResult<IEnumerable<XFileDto>>> Upload( Task<ActionResult<IEnumerable<XFileDto>>> Upload(
[FromForm] IFormFileCollection files [FromForm] IFormFileCollection files
); );
/// <summary> /// <summary>
/// Remove Specified Files ... /// Remove Specified Files ...
/// </summary> /// </summary>
@@ -113,7 +122,7 @@ namespace xFileService.Interfaces
/// <returns></returns> /// <returns></returns>
Task<ActionResult<IEnumerable<Guid>>> Remove( Task<ActionResult<IEnumerable<Guid>>> Remove(
[FromQuery] string ids [FromQuery] string ids
); );
#endregion #endregion
// //
@@ -126,7 +135,7 @@ namespace xFileService.Interfaces
/// <returns></returns> /// <returns></returns>
Task<ActionResult<XFileDto>> Get( Task<ActionResult<XFileDto>> Get(
[FromRoute] Guid id [FromRoute] Guid id
); );
/// <summary> /// <summary>
/// Get All Exists File Models ... /// Get All Exists File Models ...
@@ -166,7 +175,7 @@ namespace xFileService.Interfaces
/// <returns></returns> /// <returns></returns>
Task<ActionResult<bool>> IsExists( Task<ActionResult<bool>> IsExists(
[FromRoute] Guid id [FromRoute] Guid id
); );
#endregion #endregion
} }
} }
Providers/XFileProvider.cs
+69 -24
View File
@@ -216,14 +216,14 @@ namespace xFileService.Providers
/// <summary> /// <summary>
/// Attach Tag to Specified File ... /// Attach Tag to Specified File ...
/// </summary> /// </summary>
/// <param name="tag"></param>
/// <param name="id"></param> /// <param name="id"></param>
/// <param name="tag"></param>
/// <param name="userInfo"></param> /// <param name="userInfo"></param>
/// <param name="connectionId"></param> /// <param name="connectionId"></param>
/// <returns></returns> /// <returns></returns>
public async Task TagAttach( public async Task AttachTag(
string tag,
Guid id, Guid id,
string tag,
XUserClaimsInfoDto userInfo = null, XUserClaimsInfoDto userInfo = null,
string connectionId = null string connectionId = null
) )
@@ -264,14 +264,14 @@ namespace xFileService.Providers
/// <summary> /// <summary>
/// Detach Tag fro Specified File ... /// Detach Tag fro Specified File ...
/// </summary> /// </summary>
/// <param name="tag"></param>
/// <param name="id"></param> /// <param name="id"></param>
/// <param name="tag"></param>
/// <param name="userInfo"></param> /// <param name="userInfo"></param>
/// <param name="connectionId"></param> /// <param name="connectionId"></param>
/// <returns></returns> /// <returns></returns>
public async Task TagDetach( public async Task DetachTag(
string tag,
Guid id, Guid id,
string tag,
XUserClaimsInfoDto userInfo = null, XUserClaimsInfoDto userInfo = null,
string connectionId = null string connectionId = null
) )
@@ -311,14 +311,14 @@ namespace xFileService.Providers
/// <summary> /// <summary>
/// Attach Tags for Specified File ... /// Attach Tags for Specified File ...
/// </summary> /// </summary>
/// <param name="tags"></param>
/// <param name="id"></param> /// <param name="id"></param>
/// <param name="tags"></param>
/// <param name="userInfo"></param> /// <param name="userInfo"></param>
/// <param name="connectionId"></param> /// <param name="connectionId"></param>
/// <returns></returns> /// <returns></returns>
public async Task TagsAttach( public async Task AttachTags(
IEnumerable<string> tags,
Guid id, Guid id,
IEnumerable<string> tags,
XUserClaimsInfoDto userInfo = null, XUserClaimsInfoDto userInfo = null,
string connectionId = null string connectionId = null
) )
@@ -349,11 +349,11 @@ namespace xFileService.Providers
foreach (var tag in tags) foreach (var tag in tags)
{ {
// //
await TagAttach( await AttachTag(
tag, id: id,
id, tag: tag,
userInfo, userInfo: userInfo,
connectionId connectionId: connectionId
); );
} }
} }
@@ -364,14 +364,14 @@ namespace xFileService.Providers
/// <summary> /// <summary>
/// Detach Tags for Specified File ... /// Detach Tags for Specified File ...
/// </summary> /// </summary>
/// <param name="tags"></param>
/// <param name="id"></param> /// <param name="id"></param>
/// <param name="tags"></param>
/// <param name="userInfo"></param> /// <param name="userInfo"></param>
/// <param name="connectionId"></param> /// <param name="connectionId"></param>
/// <returns></returns> /// <returns></returns>
public async Task TagsDetach( public async Task DetachTags(
IEnumerable<string> tags,
Guid id, Guid id,
IEnumerable<string> tags,
XUserClaimsInfoDto userInfo = null, XUserClaimsInfoDto userInfo = null,
string connectionId = null string connectionId = null
) )
@@ -402,11 +402,11 @@ namespace xFileService.Providers
foreach (var tag in tags) foreach (var tag in tags)
{ {
// //
await TagDetach( await DetachTag(
tag, id: id,
id, tag: tag,
userInfo, userInfo: userInfo,
connectionId connectionId: connectionId
); );
} }
} }
@@ -421,7 +421,7 @@ namespace xFileService.Providers
/// <param name="userInfo"></param> /// <param name="userInfo"></param>
/// <param name="connectionId"></param> /// <param name="connectionId"></param>
/// <returns></returns> /// <returns></returns>
public async Task TagsDetach( public async Task DetachTags(
Guid id, Guid id,
XUserClaimsInfoDto userInfo = null, XUserClaimsInfoDto userInfo = null,
string connectionId = null string connectionId = null
@@ -452,6 +452,47 @@ namespace xFileService.Providers
catch { } catch { }
} }
} }
/// <summary>
/// Get Specified Model's Tag ...
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
public async Task<IEnumerable<string>> GetTags(Guid id)
{
//
// Validate ...
var isValid = !id.IsNull() &&
!id.IsDefaultGuid();
if (!isValid)
{
XException.InvalidArgs.Throw();
}
//
// Check Model Exists ...
isValid = await IsExists(id);
if (!isValid)
{
XException.NotFound.Throw();
}
//
var tags = await TagProvider.GetTags(id);
//
var result = new List<string>();
isValid = !tags.IsNull() && tags.HasChild();
if (isValid)
{
//
result = tags.Select(t => t.Tag)
.ToList();
}
//
return result;
}
#endregion #endregion
// //
@@ -805,7 +846,11 @@ namespace xFileService.Providers
// //
// Here we send Null Connection ID for Preventing Update Push ... // Here we send Null Connection ID for Preventing Update Push ...
// since we Remove Entity ... // since we Remove Entity ...
await TagsDetach(id, userInfo, null); await DetachTags(
id: id,
userInfo: userInfo,
connectionId: null
);
} }
} }