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.

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

Consolidate .Admin, .Api and .Mobile #507

Merged
merged 29 commits into from
Dec 18, 2023
Merged

Consolidate .Admin, .Api and .Mobile #507

merged 29 commits into from
Dec 18, 2023

Conversation

tkapa
Copy link
Member

@tkapa tkapa commented Dec 13, 2023

Closes #505

As per my conversation with @matt-goldman, our priority at the moment is to consolidate our repos:
SSW.Rewards.Mobile https://github.com/SSWConsulting/SSW.Rewards.Mobile
SSW.Rewards.Admin https://github.com/SSWConsulting/SSW.Rewards.Admin
SSW.Rewards.API https://github.com/SSWConsulting/SSW.Rewards.API

Folder Structure

The goal is to position these repos in a fashion resembling Matt's .NET MAUI CA template. See the screenshot below to see the new folder structure.

For the purposes of this new structure I've renamed some projects.
From
SSW.Rewards.Mobile.csproj
To
MobileUI.csproj

From
UI.csproj (SSW.Rewards.Admin UI)
To
AdminUI.csproj

src/Common

  • Shared.csproj

src/Core

  • /Application/SSW.Rewards.Application.csproj
  • /Domain/SSW.Rewards.Domain.csproj

src/Infrastructure

  • SSW.Rewards.Infrastructure.csproj

src/Presentation

  • /WebAPI/WebAPI.csproj
  • /UI
    • /MobileUI/MobileUI.csproj
    • /AdminUI/AdminUI.csproj

image

Figure: new folder structure in SSW.Rewards.Mobile

CI/CD

Adds the .github/workflows .azure and infra folders.

I've updated all workflow files with the project they came from. and done the same where relevant in the infra folder.

.azure is relevant to .Admin

@tkapa tkapa self-assigned this Dec 13, 2023
@tkapa tkapa linked an issue Dec 13, 2023 that may be closed by this pull request
21 tasks
@tkapa tkapa marked this pull request as ready for review December 13, 2023 23:19
@zacharykeeping
Copy link
Member

Getting an error on build that "/SSW.Rewards/tests/Application.IntegrationTests/appsettings.json" could not be copied as it could not be found. Looks like this file went missing in this PR.

@tkapa
Copy link
Member Author

tkapa commented Dec 14, 2023

Getting an error on build that "/SSW.Rewards/tests/Application.IntegrationTests/appsettings.json" could not be copied as it could not be found. Looks like this file went missing in this PR.

@zacharykeeping looks like there is a .gitignore that wanted to make sure no appsettings.json was committed. I've made sure that only appsettings.json in the src folder are ignored for now.

@Anton-Polkanov do you think we should continue with this ignore?

Copy link
Member

@AntPolkanov AntPolkanov left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Checked that all projects are running.

@tkapa tkapa merged commit d0f4766 into main Dec 18, 2023
2 checks passed
@tkapa tkapa deleted the merge-api branch December 18, 2023 00:39
@adamcogan
Copy link
Member

adamcogan commented Dec 29, 2023

⚠️ Have we lost the source code history? If so, then we need to revert this.
We need to have a conversation about this revert.

And we need to have a conversation if a decision is going to be taken about losing all our source code history.

This fix should not be a big deal.
Ideally we should be merge the history into point where the commit is (aka rewinding the head to before the PR started and then merge the history of the other repos, then reply the PR and the subsequent commits.

@matt-goldman matt-goldman mentioned this pull request Jan 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

♻️ Refactor - Merge Admin, API into Mobile Repository
4 participants