Merge both Bindu Studio & Bindu Server into one repository

[deshetti]

While it was easier to start with multiple repos for each application it is getting harder to manage as we have more applications developed at Factly. It might be better, in the long run, to keep each application to just one repository. Meaning merge Studio, Server and any API repos that the application has into one per application.

I see that it would benefit in the following ways:

• Each application/repository will have one docker-compose file that should be enough to have the application up and running
• Don't have to duplicate the issues for implementing in backend and frontend
• Easier for release management to make sure the features are not out of sync

We could start by merging Bindu repos into one and then work on other applications based on how this would go. Following are a few things that I am thinking of:

Structure of the repo would be the following:

.
├── .github
│   └── workflows
│       ├── docker.yml
│       └── sonar.yml
├── .gitignore
├── README.md
├── api
│   ├── Dockerfile
│   ├── README.md
│   └── sonar-project.properties
├── config.env
├── docker-compose.yml
├── server
│   ├── Dockerfile
│   ├── README.md
│   └── sonar-project.properties
└── studio
    ├── Dockerfile
    ├── README.md
    └── sonar-project.properties

• There will be a README.md file for the entire project and each of the studio, server etc will have its own README.md files which will be the same as they are now in their individual repos.
• The main repo will have a docker-compose file which will start the entire application using the Dockerfiles from within the repos
• There would be just one config.env (if that is possible) in the root directory where all the env variables for all the studio, server etc are stored in one place
• Each directory has sonar-project.properties file to run the sonar checks on the codebase
• Modify the Github actions to run sonar.yml on each Commit/PR as we do now on individual repos using ci.yml. We would be adding Github action docker.yaml to create and upload Docker images for PR merges.
• .gitignore to ignore all the files in the application based on the programming languages used. Use https://www.toptal.com/developers/gitignore to generate the combined gitignore file. For example select visualstudiocode, intellij, go, react to generate the .gitignore file for this repo.

Procedure to merge the repos using Git

Follow the steps as mentioned here in these two links:

• https://gist.github.com/msrose/2feacb303035d11d2d05
• https://medium.com/@checko/merging-two-git-repositories-into-one-preserving-the-git-history-4e20d3fafa4e

Pointers to merge the two repos into one:

• Make sure all the PRs are merged and all the branches for both bindu-studio and bindu-server are cleaned up
• Make bindu-studio repo as the main repo and merge bindu-server into this repo.
• Make sure that we do not lose commit history on both the repos
• Once the bindu-server repo is merged, we can move all the issues from the bindu-server repo to the main repo
• Rename the repo to just bindu after the merging is completed
• Make relevant changes in the ecosystem repo after merging is completed

Migrating Issues:

Use Github Cli to transfer the issues using the following command:

for i in `gh issue list -s all -L 100 | awk '{print $1}'`; do  gh issue transfer $i factly/mande; done;

[hetjagani]

I have tested and created test repo in my github account to see if all history is preserved for merged repos and I think this method works well for what we need.

If we want to proceed further then we should merge all PRs and all in bindu-server and bindu-studo.