diff --git a/MidrandBookshop/Components/Pages/Home.razor.cs b/MidrandBookshop/Components/Pages/Home.razor.cs
index 8c9823e..4933680 100644
--- a/MidrandBookshop/Components/Pages/Home.razor.cs
+++ b/MidrandBookshop/Components/Pages/Home.razor.cs
@@ -1,4 +1,4 @@
-using LiteCharms.Features.MidrandBooks;
+using LiteCharms.Features;
using LiteCharms.Features.MidrandBooks.AuthorBooks;
using LiteCharms.Features.MidrandBooks.Authors;
using LiteCharms.Features.MidrandBooks.Categories;
diff --git a/MidrandBookshop/Components/Pages/ProductView.razor.cs b/MidrandBookshop/Components/Pages/ProductView.razor.cs
index 99e591e..09090e3 100644
--- a/MidrandBookshop/Components/Pages/ProductView.razor.cs
+++ b/MidrandBookshop/Components/Pages/ProductView.razor.cs
@@ -1,4 +1,4 @@
-using LiteCharms.Features.MidrandBooks;
+using LiteCharms.Features;
using LiteCharms.Features.MidrandBooks.Authors;
using LiteCharms.Features.MidrandBooks.Authors.Models;
using LiteCharms.Features.MidrandBooks.Products;
@@ -35,7 +35,6 @@ public partial class ProductView : ComponentBase
CurrentAuthor = null;
Thumbnails.Clear();
- // 1. Resolve product listing details
var productResult = await ProductService.GetProductAsync(BookId);
if (productResult.IsSuccess && productResult.Value != null)
@@ -43,31 +42,24 @@ public partial class ProductView : ComponentBase
CurrentProduct = productResult.Value;
AuthorName = CurrentProduct.Metadata?.Manufacturer ?? "Unknown Author";
- // 2. Load pricing data
var priceResult = await ProductService.GetProductPriceAsync(BookId);
LivePrice = priceResult.IsSuccess ? priceResult.Value.Amount : 0m;
- // 3. Extract active catalog categories
var categoryResult = await ProductService.GetProductCategoriesAsync(BookId);
if (categoryResult.IsSuccess && categoryResult.Value.Length > 0)
- {
PrimaryCategory = categoryResult.Value[0].Name ?? "General";
- }
- // 4. Retrieve complete contextual model through the newly instantiated AuthorService lookup
var authorResult = await AuthorService.GetAuthorByProductIdAsync(BookId);
if (authorResult.IsSuccess && authorResult.Value != null)
{
CurrentAuthor = authorResult.Value;
- // Format fully qualified author text cleanly depending on their publisher model details
if (CurrentAuthor.PublisherType == PublisherTypes.Company && !string.IsNullOrWhiteSpace(CurrentAuthor.Company))
AuthorName = CurrentAuthor.Company;
else
AuthorName = $"{CurrentAuthor.Name} {CurrentAuthor.LastName}".Trim();
}
- // 5. Build presentation image viewer variables
if (!string.IsNullOrWhiteSpace(CurrentProduct.ImageUrl))
Thumbnails.Add(CurrentProduct.ImageUrl);
diff --git a/MidrandBookshop/MidrandBookshop.csproj b/MidrandBookshop/MidrandBookshop.csproj
index ccff6e2..bde52a2 100644
--- a/MidrandBookshop/MidrandBookshop.csproj
+++ b/MidrandBookshop/MidrandBookshop.csproj
@@ -18,13 +18,13 @@
-
+
-
+
diff --git a/MidrandBookshop/Program.cs b/MidrandBookshop/Program.cs
index c50e038..2df04c5 100644
--- a/MidrandBookshop/Program.cs
+++ b/MidrandBookshop/Program.cs
@@ -23,6 +23,7 @@ builder.Services.AddEmailServices(builder.Configuration);
builder.Services.AddEmailServiceBus();
builder.Services.AddShopServices();
+builder.Services.AddHashServices(builder.Configuration);
builder.Services.AddMidrandShopDatabase(builder.Configuration);
builder.Services.AddMidrandShopPostgresHealthCheck();
diff --git a/midrandbooks-uat.yml b/midrandbooks-uat.yml
index 453e5bb..2381d8b 100644
--- a/midrandbooks-uat.yml
+++ b/midrandbooks-uat.yml
@@ -14,6 +14,11 @@ data:
ASPNETCORE_URLS: "http://0.0.0.0:8080"
Monitoring__Address: "http://aspire-dashboard-service.aspire.svc.cluster.local:18889"
Monitoring__ServiceName: "MidrandBooks.Uat"
+ HasherSettings__MinHashLength: "11"
+ BookshopS3Settings__ServiceUrl: "http://garage.garage.svc.cluster.local:3900"
+ BookshopS3Settings__Region: "garage"
+ BookshopS3Settings__BucketName: "bookshop"
+ BookshopS3Settings__CdnBaseUrl: "https://bookshop.cdn.khongisa.co.za"
---
apiVersion: v1
kind: Secret
@@ -25,6 +30,10 @@ data:
connection-string: SG9zdD0xOTIuMTY4LjEuMTcwO0RhdGFiYXNlPW1pZHJhbmRzaG9wLWRldjtVc2VybmFtZT1taWRyYW5kc2hvcC1kZXYtdXNlcjtQYXNzd29yZD1hUFh5a0tnM3RTOWNtRDtQZXJzaXN0IFNlY3VyaXR5IEluZm89VHJ1ZQ==
connection-string-quartz: SG9zdD0xOTIuMTY4LjEuMTcwO0RhdGFiYXNlPXNjaGVkdWxlci1kZXY7VXNlcm5hbWU9c2NoZWR1bGVyLWRldi11c2VyO1Bhc3N3b3JkPWtWVm1vV0tKM3h6Z1FYO1BlcnNpc3QgU2VjdXJpdHkgSW5mbz1UcnVl
aspire-apikey: bWMzRzYzSzJqNVpPRXNpMEFqTW9qTFRYbTFLRVpGY3R6SUlqU3dEaVRHdXQ4cUdTa1B1V3d4R1AxUmJzY0pVbw==
+ hasher-salt: TGlnaHQgQ2hhcm1zLCBNaWRyYW5kQm9va3MgbWFrZSBsb3RzIG9mIG1vbmV5IGFuZCBhcmUgYSBzdWNjZXNzZnVsIHZpcmFsIHN0b3J5IGluIFNvdXRoIEFmcmljYQ==
+ hasher-payfastpassphrase: OUdBSVIwdFdwaFgwcU8=
+ bookshop-s3-accesskey: R0s1MTRkMmNlOGRjNjkyMzdhMDVjMDFlZWY=
+ bookshop-s3-secretkey: ZWFhZmVkYTFhZWQ0MDllY2ZlNjA3MTRlY2RhNTQ5YjgyYmRmNWEzZGFmOWYxOGRkNjFmNjZiNDk3M2E2NDgyZQ==
---
apiVersion: v1
kind: PersistentVolumeClaim
@@ -77,6 +86,26 @@ spec:
- configMapRef:
name: midrandbooks-config
env:
+ - name: BookshopS3Settings__AccessKey
+ valueFrom:
+ secretKeyRef:
+ name: midrandbooks-secrets
+ value: bookshop-s3-accesskey
+ - name: BookshopS3Settings__SecretKey
+ valueFrom:
+ secretKeyRef:
+ name: midrandbooks-secrets
+ value: bookshop-s3-secretkey
+ - name: HasherSettings__Salt
+ valueFrom:
+ secretKeyRef:
+ name: midrandbooks-secrets
+ value: hasher-salt
+ - name: HasherSettings__PayfastPassphrase
+ valueFrom:
+ secretKeyRef:
+ name: midrandbooks-secrets
+ value: hasher-payfastpassphrase
- name: ConnectionStrings__PostgresScheduler
valueFrom:
secretKeyRef:
@@ -86,17 +115,7 @@ spec:
valueFrom:
secretKeyRef:
name: midrandbooks-secrets
- key: connection-string
- - name: Monitoring__Address
- valueFrom:
- configMapKeyRef:
- name: midrandbooks-config
- key: Monitoring__Address
- - name: Monitoring__ServiceName
- valueFrom:
- configMapKeyRef:
- name: midrandbooks-config
- key: Monitoring__ServiceName
+ key: connection-string
- name: Monitoring__ApiKey
valueFrom:
secretKeyRef: