Compare commits

...
53 Commits
Author SHA1 Message Date
khwezi ee6beef603 Merge pull request 'Redacted Product.Price mapping on filter' (#50) from midrandshop into master
Reviewed-on: #50
2026-05-30 18:49:38 +02:00
Khwezi Mngoma 4f6dbfcd37 Redacted Product.Price mapping on filter
continuous-integration/drone/pr Build is passing
2026-05-30 18:49:15 +02:00
khwezi 1c3f3eaf0d Merge pull request 'Added a way to get the Author by productId' (#49) from midrandshop into master
Reviewed-on: #49
2026-05-30 18:20:21 +02:00
Khwezi Mngoma 91ede2d568 Added a way to get the Author by productId
continuous-integration/drone/pr Build is passing
2026-05-30 18:17:55 +02:00
khwezi 2e77666d9e Merge pull request 'Added category seeder' (#48) from midrandshop into master
Reviewed-on: #48
2026-05-30 16:08:11 +02:00
Khwezi Mngoma 4d21740124 Added category seeder
continuous-integration/drone/pr Build is passing
2026-05-30 16:07:23 +02:00
khwezi 1977b6b301 Merge pull request 'midrandshop' (#47) from midrandshop into master
Reviewed-on: #47
2026-05-30 15:37:09 +02:00
khwezi 0ab14d8b63 Merge pull request 'midrandshop' (#46) from midrandshop into master
Reviewed-on: #46
2026-05-30 00:14:10 +02:00
khwezi 466458e230 Merge pull request 'Implemented Product Data Seeder' (#45) from midrandshop into master
Reviewed-on: #45
2026-05-29 18:56:45 +02:00
khwezi 141d32f591 Merge pull request 'Refactored migrations' (#44) from midrandshop into master
Reviewed-on: #44
2026-05-29 09:03:27 +02:00
khwezi d9e7f225ae Merge pull request 'midrandshop' (#43) from midrandshop into master
Reviewed-on: #43
2026-05-29 08:23:15 +02:00
khwezi 6ae63e2ad1 Merge pull request 'midrandshop' (#42) from midrandshop into master
Reviewed-on: #42
2026-05-27 09:15:44 +02:00
khwezi f5efdde37c Merge pull request 'Refactored connection string name' (#41) from midrandshop into master
Reviewed-on: #41
2026-05-24 13:51:11 +02:00
khwezi 1592d5dc8f Merge pull request 'midrandshop' (#40) from midrandshop into master
Reviewed-on: #40
2026-05-24 13:43:22 +02:00
khwezi 50a8a59d92 Merge pull request 'Split Features to create space for more projects' (#39) from midrandshop into master
Reviewed-on: #39
2026-05-24 13:19:55 +02:00
khwezi b70d9559b0 Merge pull request 'midrandshop' (#38) from midrandshop into master
Reviewed-on: #38
2026-05-23 11:55:02 +02:00
khwezi 81d5e8f07c Merge pull request 'Added MidrandShop feature and spl;it extensions and healthchecks' (#37) from midrandshop into master
Reviewed-on: #37
2026-05-23 11:49:27 +02:00
khwezi 20a53942b5 Merge pull request 'Added product metadata' (#36) from s3service into master
Reviewed-on: #36
2026-05-20 21:15:01 +02:00
khwezi 9edb2aa4aa Merge pull request 'Optimised UploadFileAsync()' (#35) from s3service into master
Reviewed-on: #35
2026-05-20 15:33:47 +02:00
khwezi 6ed023f2cf Merge pull request 'Refactored the S3 services to properly upload the file' (#34) from s3service into master
Reviewed-on: #34
2026-05-20 08:03:43 +02:00
khwezi 2c9f5a846c Merge pull request 'Updated how i use configs' (#33) from s3service into master
Reviewed-on: #33
2026-05-19 14:57:59 +02:00
khwezi 41f7c05be3 Merge pull request 'Refactored service to internalise the CDN' (#32) from s3service into master
Reviewed-on: #32
2026-05-19 11:34:51 +02:00
khwezi 1a03355e84 Merge pull request 'Added S3 support' (#31) from s3service into master
Reviewed-on: #31
2026-05-19 10:24:05 +02:00
khwezi 7743c3178e Merge pull request 'Simplified notification updating' (#30) from emailjobs into master
Reviewed-on: #30
2026-05-17 16:01:24 +02:00
khwezi ab3d8e6e9a Merge pull request 'Refactored GetNotificationsAsync() date handling' (#29) from emailjobs into master
Reviewed-on: #29
2026-05-17 13:14:01 +02:00
khwezi db4c348288 Merge pull request 'Fixed email sending logic' (#28) from emailjobs into master
Reviewed-on: #28
2026-05-16 00:29:01 +02:00
khwezi 6683234642 Merge pull request 'Refactored batch drop logic' (#27) from emailjobs into master
Reviewed-on: #27
2026-05-16 00:05:51 +02:00
khwezi 6ddbb9479a Merge pull request 'Added an empty constructor to ProcessEmailNotificationEvent' (#26) from emailjobs into master
Reviewed-on: #26
2026-05-15 23:53:09 +02:00
khwezi 6c7349a0f8 Merge pull request 'Added additional logging and traces' (#25) from emailjobs into master
Reviewed-on: #25
2026-05-15 23:21:52 +02:00
khwezi e97fd6cd3f Merge pull request 'Added debug logging' (#24) from emailjobs into master
Reviewed-on: #24
2026-05-15 23:09:21 +02:00
khwezi 184c7c252a Merge pull request 'Set misfireThreshold to 2min and eased Cluster node checkin limit' (#23) from emailjobs into master
Reviewed-on: #23
2026-05-15 22:29:08 +02:00
khwezi bfe8c458d6 Merge pull request 'Optimised quartz' (#22) from emailjobs into master
Reviewed-on: #22
2026-05-15 09:52:06 +02:00
khwezi e6e0475db1 Merge pull request 'emailjobs' (#21) from emailjobs into master
Reviewed-on: #21
2026-05-15 08:39:36 +02:00
khwezi 5090c60797 Merge pull request 'Fixed Lead->Customer Relationship' (#20) from emailjobs into master
Reviewed-on: #20
2026-05-15 07:55:56 +02:00
khwezi 9432252e15 Merge pull request 'Added khongisa host entry on pipeline commands' (#19) from emailjobs into master
Reviewed-on: #19
2026-05-14 02:54:00 +02:00
khwezi 47111a1a3a Merge pull request 'emailjobs' (#18) from emailjobs into master
Reviewed-on: #18
2026-05-14 02:49:34 +02:00
khwezi 6eb3d50375 Merge pull request 'Updated job scheduler' (#17) from emailjobs into master
Reviewed-on: #17
2026-05-10 17:33:23 +02:00
khwezi 4deb732804 Merge pull request 'emailjobs' (#16) from emailjobs into master
Reviewed-on: #16
2026-05-10 16:51:24 +02:00
khwezi 20d9387d0b Merge pull request 'Migrated database changes' (#15) from develop into master
Reviewed-on: #15
2026-05-10 11:17:54 +02:00
khwezi 9f6d0ccaa0 Merge pull request 'Populated README' (#14) from develop into master
Reviewed-on: #14
2026-05-10 09:48:35 +02:00
khwezi 1acbc4d213 Merge pull request 'fixed git repo naming' (#13) from develop into master
Reviewed-on: #13
2026-05-10 09:22:37 +02:00
khwezi 8c99668fac Merge pull request 'Added tag and release step after publish' (#12) from develop into master
Reviewed-on: #12
2026-05-10 09:19:33 +02:00
khwezi ad44f46204 Merge pull request 'Refactored Quartz instance id to AUTO, removed constant' (#11) from develop into master
Reviewed-on: #11
2026-05-10 08:21:08 +02:00
khwezi 49d999c1e3 Merge pull request 'Refactored postgres extension' (#10) from develop into master
Reviewed-on: #10
2026-05-09 17:45:00 +02:00
khwezi 9ed4777a18 Merge pull request 'Refactored database references' (#9) from develop into master
Reviewed-on: #9
2026-05-09 17:01:02 +02:00
khwezi 0cf44f68cc Merge pull request 'Added scheduler constants' (#8) from develop into master
Reviewed-on: #8
2026-05-09 15:27:50 +02:00
khwezi 41ed5a4288 Merge pull request 'Fixed quartz host config table prefix' (#7) from develop into master
Reviewed-on: #7
2026-05-09 13:30:33 +02:00
khwezi bbcba5e06c Merge pull request 'Fixed quartz table name prefix' (#6) from develop into master
Reviewed-on: #6
2026-05-09 13:28:29 +02:00
khwezi 502cc326dd Merge pull request 'Updated pipeline to use major version with minor always 0' (#5) from develop into master
Reviewed-on: #5
2026-05-09 12:02:19 +02:00
khwezi 4675d4c5fc Merge pull request 'Updated pipeline to use major versions only' (#4) from develop into master
continuous-integration/drone/push Build was killed
continuous-integration/drone Build is failing
Reviewed-on: #4
2026-05-09 11:56:20 +02:00
khwezi f80bb2fff9 Merge pull request 'Changed target branch from nain to master' (#3) from dronepipeline into master
continuous-integration/drone/push Build is passing
continuous-integration/drone Build is passing
Reviewed-on: #3
2026-05-09 11:37:39 +02:00
khwezi 6767906b0d Merge pull request 'Added pipeline separator' (#2) from dronepipeline into master
Reviewed-on: #2
2026-05-09 11:25:34 +02:00
khwezi a344af4498 Merge pull request 'Added .drone.yml pipeline' (#1) from dronepipeline into master
Reviewed-on: #1
2026-05-09 11:12:38 +02:00
6 changed files with 162 additions and 2 deletions
@@ -0,0 +1,133 @@
using LiteCharms.Features.MidrandBooks.Categories;
using LiteCharms.Features.MidrandBooks.Products;
namespace LiteCharms.Features.MidrandBooks.Seed;
public class CategorySeederService(CategoryService categoryService, ProductService productService, IFeatureManager features,
ILogger<CategorySeederService> logger) : BackgroundService
{
protected override async Task ExecuteAsync(CancellationToken stoppingToken)
{
if (!await features.IsEnabledAsync("CategorySeederService")) return;
logger.LogInformation("Category and Product-Tag Mapping Seeding started (15-char limit applied)");
// Initialize Bogus to ensure repeatable distribution matrix pathing
var faker = new Faker();
Randomizer.Seed = new Random(101);
// 1. Curate Broad Book Categories (IsMain = true, Max 20, Max 15 chars)
var broadMainCategories = new[]
{
"Fiction", "Non-Fiction", "Youth & Kids", "Academic",
"Biographies", "Business", "Sci-Fi & Fantasy",
"Thrillers", "Self-Help", "History",
"Spirituality", "Arts & Photo", "Technology",
"Cookbooks", "Travel & Maps", "Poetry & Drama", "Graphic Novels"
};
// 2. Curate Niche Subcategories/Tags (IsMain = false, Max 15 chars)
var specializedSubCategories = new[]
{
"Cyberpunk", "Space Opera", "Historical Fix", "Cozy Mystery", "True Crime",
"Agile Project", "Software Eng", "AI & ML", "Cloud Comput",
"SA History", "African Lit", "Apartheid Era", "Mandela Legacy",
"Finance", "Investments", "Startup", "Leadership",
"CBT Therapy", "Mindfulness", "Yoga & Health",
"Baking Basics", "African Food", "Vegan Recipes",
"Ancient World", "WWII History", "Geopolitics",
"Writing Guides", "Criticism", "Classic Poetry",
"Early Learning", "Teen Romance", "Survival",
"Urban Fantasy", "Dark Fantasy", "Psych Thriller", "Hard Sci-Fi",
"Data Science", "DevOps", "Cybersecurity",
"Economics", "Real Estate", "Governance",
"Essays", "Memoirs", "Art History",
"Architecture", "Photography", "Travel Writing",
"Gaming Culture", "Philosophy", "Ethics",
"DIY Home", "SA Gardening", "Parenting"
};
// 3. Seed Main Categories into the System
logger.LogInformation("Seeding broad main categories...");
foreach (var mainCat in broadMainCategories)
{
if (stoppingToken.IsCancellationRequested) return;
// Defensive truncation fallback just in case strings get modified later
string safeName = mainCat.Length > 15 ? mainCat.Substring(0, 15) : mainCat;
var result = await categoryService.CreateCategoryAsync(safeName, isMain: true, stoppingToken);
if (result.IsFailed && !result.Errors[0].Message.Contains("already exists", StringComparison.OrdinalIgnoreCase))
{
logger.LogWarning("Notice while adding main category '{Name}': {Msg}", safeName, result.Errors[0].Message);
}
}
// 4. Seed Subcategories into the System
logger.LogInformation("Seeding boundless specialized niche tags...");
foreach (var subCat in specializedSubCategories)
{
if (stoppingToken.IsCancellationRequested) return;
string safeName = subCat.Length > 15 ? subCat.Substring(0, 15) : subCat;
var result = await categoryService.CreateCategoryAsync(safeName, isMain: false, stoppingToken);
if (result.IsFailed && !result.Errors[0].Message.Contains("already exists", StringComparison.OrdinalIgnoreCase))
{
logger.LogWarning("Notice while adding subcategory '{Name}': {Msg}", safeName, result.Errors[0].Message);
}
}
// 5. Query back all enabled categories to extract active IDs for junction mapping
var fetchMainResult = await categoryService.GetCategoriesAsync(isMain: true, stoppingToken);
var fetchSubResult = await categoryService.GetCategoriesAsync(isMain: false, stoppingToken);
if (fetchMainResult.IsFailed || fetchSubResult.IsFailed)
{
logger.LogError("Aborting junction seeding: Could not retrieve categories from data store.");
return;
}
var mainCategoryIds = fetchMainResult.Value.Select(c => c.Id).ToArray();
var subCategoryIds = fetchSubResult.Value.Select(c => c.Id).ToArray();
// 6. Map Categories to your Product Collection (Product IDs 0 - 21)
logger.LogInformation("Beginning Product-Category mapping assignments for Product IDs 0 through 21...");
for (long productId = 0; productId <= 21; productId++)
{
if (stoppingToken.IsCancellationRequested) break;
// Every book belongs to 1 or 2 main categories
int mainCategoriesToAssign = faker.Random.Number(1, 2);
var chosenMainIds = faker.PickRandom(mainCategoryIds, mainCategoriesToAssign).Distinct();
foreach (var mainId in chosenMainIds)
{
var linkResult = await productService.AddProductCategoryAsync(productId, mainId, stoppingToken);
if (linkResult.IsFailed)
{
if (!linkResult.Errors[0].Message.Contains("exist", StringComparison.OrdinalIgnoreCase))
{
logger.LogDebug("Junction note for Product {PId} and Main Category {CId}: {Msg}", productId, mainId, linkResult.Errors[0].Message);
}
}
}
// Every book gets 1 to 4 granular subgenre tags
int subCategoriesToAssign = faker.Random.Number(1, 4);
var chosenSubIds = faker.PickRandom(subCategoryIds, subCategoriesToAssign).Distinct();
foreach (var subId in chosenSubIds)
{
var linkResult = await productService.AddProductCategoryAsync(productId, subId, stoppingToken);
if (linkResult.IsFailed && !linkResult.Errors[0].Message.Contains("exist", StringComparison.OrdinalIgnoreCase))
{
logger.LogDebug("Junction note for Product {PId} and Sub Category {CId}: {Msg}", productId, subId, linkResult.Errors[0].Message);
}
}
}
logger.LogInformation("Category and Product-Tag Mapping Seeding completed successfully.");
}
}
@@ -16,6 +16,7 @@ builder.Services
.AddLogging()
.AddShopServices()
.AddHostedService<ProductsSeederService>()
.AddHostedService<CategorySeederService>()
.AddHostedService<CustomerSeederService>()
.AddMidrandShopDatabase(builder.Configuration);
@@ -1,5 +1,6 @@
{
"FeatureManagement": {
"CategorySeederService": true,
"CustomerSeederService": false,
"ProductsSeederService": false
},
@@ -95,7 +95,7 @@ public sealed class BooksService(IDbContextFactory<MidrandBooksDbContext> contex
.AsNoTracking()
.Include(b => b.Author)
.Include(b => b.Product)
.ThenInclude(b => b.Prices)
.ThenInclude(b => b!.Prices)
.OrderByDescending(b => b.CreatedAt)
.Where(b => b.AuthorId == authorId)
.ToListAsync(cancellationToken);
@@ -8,6 +8,29 @@ namespace LiteCharms.Features.MidrandBooks.Authors;
public sealed class AuthorService(IDbContextFactory<MidrandBooksDbContext> contextFactory) : IService
{
public async ValueTask<Result<Author>> GetAuthorByProductIdAsync(long productId, CancellationToken cancellationToken = default)
{
try
{
await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
var author = await context.Books
.AsNoTracking()
.Include(i => i.Author)
.Where(b => b.ProductId == productId)
.FirstOrDefaultAsync(cancellationToken);
if (author is null)
return Result.Fail<Author>(new Error($"No author association discovered for Product ID {productId}"));
return Result.Ok(author.Author!.ToModel());
}
catch (Exception ex)
{
return Result.Fail<Author>(new Error(ex.Message).CausedBy(ex));
}
}
public async ValueTask<Result> UpdateAuthorStatusAsync(long authorId, bool isEnabled, CancellationToken cancellationToken = default)
{
try
@@ -304,7 +304,9 @@ public sealed class ProductService(IDbContextFactory<MidrandBooksDbContext> cont
{
await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
var product = await context.Products.AsNoTracking().FirstOrDefaultAsync(p => p.Id == productId, cancellationToken);
var product = await context.Products
.Include(i => i.Price)
.AsNoTracking().FirstOrDefaultAsync(p => p.Id == productId, cancellationToken);
return product is null
? Result.Fail<Product>(new Error($"Product with ID {productId} not found."))