Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed query issues with block and page actions #12

Merged
merged 1 commit into from
Nov 19, 2024
Merged

Fixed query issues with block and page actions #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 43 additions & 0 deletions Apps.Magento/Actions/BlockActions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
using System.Globalization;
using System.Text;
using Apps.Magento.Api;
using Apps.Magento.Constants;
using Apps.Magento.Invocables;
using Apps.Magento.Models.Identifiers;
using Apps.Magento.Models.Requests;
using Apps.Magento.Models.Requests.Blocks;
using Apps.Magento.Models.Responses.Blocks;
using Apps.Magento.Utils;
Expand Down Expand Up @@ -112,4 +114,45 @@ public async Task DeleteBlockAsync([ActionParameter] BlockIdentifier identifier)
var request = new ApiRequest(requestUrl, Method.Delete, Creds);
await Client.ExecuteWithErrorHandling(request);
}

protected override string BuildQueryString(BaseFilterRequest filterRequest)
{
var queryString = new StringBuilder();
var filterIndex = 0;

if (!string.IsNullOrEmpty(filterRequest.Title))
{
queryString.Append($"[filterGroups][{filterIndex}][filters][0][field]={Uri.EscapeDataString("title")}");
queryString.Append(
$"&searchCriteria[filterGroups][{filterIndex}][filters][0][value]={Uri.EscapeDataString($"%{filterRequest.Title}%")}");
queryString.Append(
$"&searchCriteria[filterGroups][{filterIndex}][filters][0][conditionType]={Uri.EscapeDataString("like")}");

filterIndex += 1;
}

if (filterRequest.CreatedAt.HasValue)
{
queryString.Append($"[filterGroups][0][filters][{filterIndex}][field]={Uri.EscapeDataString("creation_time")}");
queryString.Append(
$"&searchCriteria[filterGroups][0][filters][{filterIndex}][value]={Uri.EscapeDataString(filterRequest.CreatedAt.Value.ToString("yyyy-MM-dd HH:mm:ss"))}");
queryString.Append(
$"&searchCriteria[filterGroups][0][filters][{filterIndex}][conditionType]={Uri.EscapeDataString("gt")}");

filterIndex += 1;
}

if (filterRequest.UpdatedAt.HasValue)
{
queryString.Append($"[filterGroups][0][filters][{filterIndex}][field]={Uri.EscapeDataString("update_time")}");
queryString.Append(
$"&searchCriteria[filterGroups][0][filters][{filterIndex}][value]={Uri.EscapeDataString(filterRequest.UpdatedAt.Value.ToString("yyyy-MM-dd HH:mm:ss"))}");
queryString.Append(
$"&searchCriteria[filterGroups][0][filters][{filterIndex}][conditionType]={Uri.EscapeDataString("gt")}");

filterIndex += 1;
}

return queryString.ToString();
}
}
43 changes: 43 additions & 0 deletions Apps.Magento/Actions/PageActions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
using System.Globalization;
using System.Text;
using Apps.Magento.Api;
using Apps.Magento.Constants;
using Apps.Magento.Invocables;
using Apps.Magento.Models.Identifiers;
using Apps.Magento.Models.Requests;
using Apps.Magento.Models.Requests.Pages;
using Apps.Magento.Models.Responses.Pages;
using Apps.Magento.Utils;
Expand Down Expand Up @@ -130,4 +132,45 @@ public async Task DeletePageByIdAsync([ActionParameter] PageIdentifier identifie
await Client.ExecuteWithErrorHandling(
new ApiRequest($"/rest/V1/cmsPage/{identifier.PageId}", Method.Delete, Creds));
}

protected override string BuildQueryString(BaseFilterRequest filterRequest)
{
var queryString = new StringBuilder();
var filterIndex = 0;

if (!string.IsNullOrEmpty(filterRequest.Title))
{
queryString.Append($"[filterGroups][{filterIndex}][filters][0][field]={Uri.EscapeDataString("title")}");
queryString.Append(
$"&searchCriteria[filterGroups][{filterIndex}][filters][0][value]={Uri.EscapeDataString($"%{filterRequest.Title}%")}");
queryString.Append(
$"&searchCriteria[filterGroups][{filterIndex}][filters][0][conditionType]={Uri.EscapeDataString("like")}");

filterIndex += 1;
}

if (filterRequest.CreatedAt.HasValue)
{
queryString.Append($"[filterGroups][0][filters][{filterIndex}][field]={Uri.EscapeDataString("creation_time")}");
queryString.Append(
$"&searchCriteria[filterGroups][0][filters][{filterIndex}][value]={Uri.EscapeDataString(filterRequest.CreatedAt.Value.ToString("yyyy-MM-dd HH:mm:ss"))}");
queryString.Append(
$"&searchCriteria[filterGroups][0][filters][{filterIndex}][conditionType]={Uri.EscapeDataString("gt")}");

filterIndex += 1;
}

if (filterRequest.UpdatedAt.HasValue)
{
queryString.Append($"[filterGroups][0][filters][{filterIndex}][field]={Uri.EscapeDataString("update_time")}");
queryString.Append(
$"&searchCriteria[filterGroups][0][filters][{filterIndex}][value]={Uri.EscapeDataString(filterRequest.UpdatedAt.Value.ToString("yyyy-MM-dd HH:mm:ss"))}");
queryString.Append(
$"&searchCriteria[filterGroups][0][filters][{filterIndex}][conditionType]={Uri.EscapeDataString("gt")}");

filterIndex += 1;
}

return queryString.ToString();
}
}
2 changes: 1 addition & 1 deletion Apps.Magento/Apps.Magento.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<Nullable>enable</Nullable>
<Product>Adobe Commerce - Magento [Beta]</Product>
<Description>Magento is the leading platform for open commerce innovation. It’s designed to be flexible and scalable, able to support businesses of all sizes – from small startups to large enterprises.</Description>
<Version>1.0.7</Version>
<Version>1.0.8</Version>
<AssemblyName>Apps.Magento</AssemblyName>
<RootNamespace>Apps.Magento</RootNamespace>
<PackageId>Apps.Magento</PackageId>
Expand Down