address merge conflicts and code quality issues

[danieleades]

there were some issues introduced by merging all those PRs without rebasing in between. This PR addresses those

[codecov]

Codecov Report

Attention: Patch coverage is 69.09091% with 34 lines in your changes missing coverage. Please review.

Project coverage is 86.96%. Comparing base (325e310) to head (734caf5).
Report is 1 commits behind head on main.

Files with missing lines	Patch %	Lines
persistence/mysql-es/src/error.rs	5.55%	17 Missing ⚠️
persistence/postgres-es/src/error.rs	5.55%	17 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##             main     #122      +/-   ##
==========================================
+ Coverage   84.18%   86.96%   +2.77%     
==========================================
  Files          20       32      +12     
  Lines        1865     3405    +1540     
==========================================
+ Hits         1570     2961    +1391     
- Misses        295      444     +149     

Flag	Coverage Δ
cqrs	84.21% <100.00%> (+0.03%)	⬆️
mysql	87.89% <66.00%> (?)
postgres	65.28% <55.00%> (?)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

[danieleades]

@davegarred this should help resolve the build issues in the other PRs

once this is merged I'll need to rebase those before any further PRs are merged (i've marked them all as 'drafts' so it's clear)

[danieleades]

If it helps, you can configure the repo to disallow merging PRs that are not up-to-date with main, and also to add a 'rebase' button to the PR

[davegarred]

Very nice, thank you!