fix: resolve remaining dev/main conflicts for PR #427#429
Merged
Conversation
#422) …rceBuilderExtensions (#262) ## Summary Extracts the inline `WithCommand` clear-data block from `AppHost.cs` into a new `MongoDbResourceBuilderExtensions` class. ## Changes - **New**: `src/AppHost/MongoDbResourceBuilderExtensions.cs` — contains `WithMongoDbDevCommands` public entry point and private `WithClearDatabaseCommand` - **Simplified**: `src/AppHost/AppHost.cs` — reduced from ~157 lines to ~30 lines; single `mongo.WithMongoDbDevCommands("myblog")` call ## Testing All 10 existing tests pass: - 5 unit tests in `MongoDbClearCommandTests` - 5 integration tests in `MongoClearDataIntegrationTests` Closes #259 Working as Sam (Backend/.NET) Co-authored-by: Boromir <boromir@squad.dev> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>## Summary <!-- Describe what this PR does and why. Link the issue it closes. --> Closes #<!-- issue number --> ## Type of Change <!-- Check all that apply --> - [ ] 🐛 Bug fix (non-breaking change that fixes an issue) - [ ] ✨ Feature (non-breaking change that adds functionality) - [ ] ♻️ Refactor (no behavior change, code cleanup/restructure) - [ ] 🧪 Tests (new or updated tests only) - [ ] 📝 Docs (README, XML docs, comments) - [ ] ⚙️ Infra/CI (GitHub Actions, Aspire, NuGet, deployment) - [ ] 🔒 Security (auth, permissions, secrets, headers) - [ ] 💥 Breaking change (existing behavior changes) ## Domain Affected <!-- Check all that apply — this determines which reviewers are required --> - [ ] 🏗️ Architecture / domain logic / CQRS → **Aragorn required** - [ ] 🔧 Backend (handlers, repositories, API endpoints, MediatR) → **Sam required** - [ ] ⚛️ Frontend (Blazor components, Razor pages, CSS, JS) → **Legolas required** - [ ] 🧪 Unit / bUnit / integration tests → **Gimli required** - [ ] 🧪 E2E / Playwright / Aspire integration tests → **Pippin required** - [ ] ⚙️ CI/CD / GitHub Actions / NuGet / Aspire AppHost → **Boromir required** - [ ] 🔒 Auth0 / authorization / security-relevant changes → **Gandalf required** - [ ] 📝 Docs / README / XML docs → **Frodo required** ## Self-Review Checklist <!-- Complete before requesting review — incomplete PRs will be returned --> ### Code Quality - [ ] I ran `dotnet build MyBlog.slnx --configuration Release` — 0 errors, 0 warnings - [ ] I ran `dotnet test MyBlog.slnx --configuration Release --no-build` — all pass - [ ] No TODO/FIXME left unless tracked in a follow-up issue (link it) - [ ] No secrets, API keys, or credentials committed ### Architecture - [ ] New handlers follow the `Command`/`Query`/`Handler`/`Validator` naming conventions - [ ] New handlers are `sealed` - [ ] Domain layer has no references to `Web` or `Persistence.*` projects - [ ] `Result<T>` / `ResultErrorCode` used for expected failures (no exception-driven control flow) - [ ] DTOs are records in `Domain.DTOs`; Models are in `Domain.Models` - [ ] No DTO types embedded in Model classes ### Tests - [ ] New code has corresponding unit tests - [ ] Integration tests use domain-specific collections (`[Collection("XxxIntegration")]`) - [ ] No test compares two `IssueDto.Empty` / `CommentDto.Empty` instances directly ### Security (check if security-relevant) - [ ] New endpoints have appropriate `RequireAuthorization` / policy applied - [ ] No `MarkupString` used with user-supplied content - [ ] No user input reflected in MongoDB queries without sanitization ### Merge Readiness - [ ] Branch is up to date with `main` (no merge conflicts) - [ ] CI checks are green (do not request review while checks are pending/failing) - [ ] PR description is complete — reviewers should not have to ask what this does ## Screenshots / Evidence <!-- For UI changes: before/after screenshots. For fixes: evidence the bug is resolved. --> ## Notes for Reviewers <!-- Anything you want reviewers to pay special attention to, or context they need. --> --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Boromir <boromir@squad.dev> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Co-authored-by: GitHub Copilot <copilot@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Boromir <lead-organizer@squad.local> Co-authored-by: mpaulosky <mpaulosky@users.noreply.github.com>
mpaulosky
enabled auto-merge (squash)
July 4, 2026 14:41
Contributor
🏗️ PR Added to Squad Triage QueueThis PR has been labeled with Next steps:
|
github-actions
Bot
added
the
squad
Comment on lines
+2
to
6
| "name": "MyBlog", | ||
| "lockfileVersion": 3, | ||
| "requires": true, | ||
| <<<<<<<< HEAD:src/Web/package-lock.json | ||
| "packages": { |
Comment on lines
2490
to
2494
| } | ||
| ======== | ||
| "packages": {} | ||
| >>>>>>>> origin/main:package-lock.json | ||
| } |
Contributor
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## dev #429 +/- ##
=======================================
Coverage 76.73% 76.73%
=======================================
Files 71 71
Lines 1775 1775
Branches 214 214
=======================================
Hits 1362 1362
Misses 336 336
Partials 77 77 🚀 New features to boost your workflow:
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Follow-up conflict resolution after #428 merge.\n\nThis PR resolves the remaining merge conflicts between origin/dev and origin/main that still blocked #427.\n\nValidation:\n- Full local pre-push gate passed (build + tests + integration)\n\nRefs #427