Origin/user friendly searching

[EdblackGitHub]

Description: Added Manual user-friendly option for our code to search CCVs

Issue: Adding a User-friendly option to the CCVs searching

Dependencies: List dependencies on open pull requests, other issue/work tickets, etc.

Merge Deadline: Merge today 11/15/2024

Pre-Merge Checklist:

• I have ensured this code follows the style guidelines of this project.
• I have performed a comprehensive self-review of the code.
• I have included comments clarifying hard-to-understand areas of the code.
• I have updated the documentation corresponding to my change(s).
• I have confirmed the code executes properly on my local environment.
• I have confirmed all new/modified data models are structured correctly.
• I have included all necessary database migration files.
• I have verified that all new and existing tests pass.
• I have received approval from the requisite number of reviewers.
• I have squashed all working commits into as few final commits as reasonably possible.
• I have confirmed Github reports all automated tests/checks are passing.

Post-Merge Checklist:

• Delete working branch @ Github repository
• Pull latest master branch to local repository
• Delete working branch @ local repository

[vbhayden]

This whole block shoul be removed -- get the connection string from settings.

from django.conf import settings

connection_url = settings.DATABASE_URL

[vbhayden]

@EdblackGitHub has this been merged with main recently? The UID generation stuff in uid/views.py looks dated.

[EdblackGitHub]

I did do a git pull to get the latest changes, after I made the branch from main. From: Trey Hayden ***@***.***> Sent: Tuesday, November 19, 2024 2:21 PM To: adlnet/LDSS-XSS ***@***.***> Cc: Edward Black ***@***.***>; Mention ***@***.***> Subject: Re: [adlnet/LDSS-XSS] Origin/user friendly searching (PR #14) @EdblackGitHub<https://github.com/EdblackGitHub> has this been merged with main recently? The UID generation stuff in uid/views.py looks dated. - Reply to this email directly, view it on GitHub<#14 (comment)>, or unsubscribe<https://github.com/notifications/unsubscribe-auth/BLGCSAT4GFNBTGMPOUGM7F32BOFQ5AVCNFSM6AAAAABR3QDXPWVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMZDIOBWGU3DANRZGI>. You are receiving this because you were mentioned.Message ID: ***@***.******@***.***>>

[vbhayden]

So the most recent version of that views file is here:

https://github.com/adlnet/LDSS-XSS/blob/main/app/uid/views.py#L60

and the corresponding line in most recent version of this branch is showing up as:

https://github.com/adlnet/LDSS-XSS/blob/origin/User_Friendly_searching/app/uid/views.py#L232

Your local one might be behind, if you tried to merge just the local branch without retrieving the most recent remote main.

[vbhayden]

This class looks like it's more related to terms yeah? Why is it in the UID portion of the project etc.

[EdblackGitHub]

They are in UID folder as I asked Florian if he had an ideal location or a preference for the search function location and he said I could leave it in the UID folder.

[vbhayden]

The neo4j dependency should not be removed here, as the app container does definitely depend on it.

[EdblackGitHub]

Uhh, I did not touch the .yml file for the manual search function.

[vbhayden]

Just merged in main into this one locally and things did update accordingly, so maybe try again on your end?

For the compose file, the main's contents for that block are currently:

    depends_on:
      db-xss:
        condition: service_healthy
      neo4j:
        condition: service_healthy

which are a good bit different, yeah? Double check that you did the merge order correctly, or this will end up being a big soup sandwich when it hits main.