fix: prioritize current site setting for org value

[navinkarkera]

Description

If multiple tenant configs are enabled for a given org, fetching value from site config for the organization should return current site config value if the org is included in the org_filter.

Private-ref: BB-7927

Testing instructions

See https://github.com/open-craft/eox-tenant/pull/3

Checklist for Merge

• [ ] Tested in a remote environment
• [x] Updated documentation
• [x] Rebased master/main
• [x] Squashed commits

[kaustavb12]

@navinkarkera Could you please add our internal ticket number here too as private ref, for easy reference.

[bra-i-am]

Hello @navinkarkera and @kaustavb12, I hope you are doing well. We thank you for contributing to this project and apologize for the delay in reviewing it due to some urgent matters.

The solution seems logical. However, before moving forward, I would like to test it to gain a more comprehensive understanding of the expected behavior and the match with all the use cases.

I followed the steps in the referenced PR https://github.com/open-craft/eox-tenant/pull/3, but it didn't work for me. In order to be more specific, here are the steps I followed:

1. Ran make {lms,cms}-up
2. Cloned your repo fork (to be allowed to use the branch navin/upstream/current-site-priority-for-org-value), went into the shells in the LMS & CMS, and ran the pip install -e command to the repo
3. Ran the two migrations despite only the LMS executed the changes (expected behavior)
4. Created the two Routes with their corresponding tenant configs the same as you did
5. Updated the redirect URLs in thestudio-sso application
6. Added the setting in the private.py files
7. Reseted

This is what I receive when I try to see the link when View live is hovered:

These are my tenant configs with the settings you told in open-craft#3 and there are shown the domains I use too

To test this PR I mounted a new environment in devstack, please let me know if maybe you have any other setting/configuration I'm missing or maybe you have an idea about what can I do to run this PR properly.

Perhaps, if you have tested this PR using Tutor, could you please guide us a little through the process you followed?

I will be closely monitoring your response to continue with my review or provide any more information if needed.

Thank you so much ✨

[navinkarkera]

Hello @bra-i-am, I just rebased the branch with master and followed the steps mentioned in https://github.com/open-craft/eox-tenant/pull/3 to test in master devstack. It worked for me and I did not do anything special.

Please make sure that you are using open-craft:navin/upstream/current-site-priority-for-org-value branch

[MaferMazu]

@navinkarkera, can you sign your commit, please?

Ref: https://docs.github.com/en/authentication/managing-commit-signature-verification/about-commit-signature-verification

[navinkarkera]

@MaferMazu Done.