Merge branch 'main' into dependabot/github_actions/actions/upload-art…

…ifact-4

.github/pull_request_template.md

@@ -1,11 +1,10 @@
-[Plain-text summary description of the solution]
+[Plain-text summary description of the solution. Include any class updates, new or edited functions, significant changes to UX, etc]
 
 PR fixes #[REPLACE WITH ISSUE NUMBER]
 
-**Changes**
-- [bullet list include any model updates]
-- [new or edited functions]
-- [significant changes to UX]
-- [design decisions, especially if architectural patterns are new/altered]
-- [can use text, screenshots, or files]
-- [a callout of any ##TODO or ##FIXMEs found/created as part of the fix]
+**Before you Submit!**
+* Is all the text internationalized?
+* If you made a change to the header, did you update the react, jsp, and html?
+* Are all depedencies at a locked version?
+* Did you adhere to [best practices](https://wildbook.docs.wildme.org/contribute/code-guide.html)?
+* Is there a quick [unit test](https://wildbook.docs.wildme.org/contribute/tests.html) you can add?

.github/workflows/dev-maven-publish.yml

@@ -26,7 +26,7 @@ jobs:
         mvn clean install -DskipTests -Dmaven.javadoc.skip=true -B
         mvn -B package --file pom.xml
     - name: Log in to Docker Hub
-      uses: docker/login-action@v2
+      uses: docker/login-action@v3
       with:
         username: wildmeorg
         password: ${{ secrets.WBIA_WILDMEBOT_DOCKER_HUB_TOKEN  }}

.github/workflows/release-maven-publish.yml

@@ -25,7 +25,7 @@ jobs:
         mvn clean install -DskipTests -Dmaven.javadoc.skip=true -B
         mvn -B package --file pom.xml
     - name: Log in to Docker Hub
-      uses: docker/login-action@v2
+      uses: docker/login-action@v3
       with:
         username: wildmeorg
         password: ${{ secrets.WBIA_WILDMEBOT_DOCKER_HUB_TOKEN  }}

.gitignore

@@ -29,6 +29,7 @@ src/main/caribwhale_data_dir
 /node_modules
 .vscode/
 *.swp
+/src/jsp/
 
 src/main/webapp/javascript/dev/MarkedIndividual.json
 src/main/webapp/javascript/dev/Relationship.json

README.md

@@ -49,6 +49,13 @@ The following git commands may prove useful.
 * `git add <filename>: add files that have changes to staging in preparation for commit
 * `git commit`: commits the stagged files, opens a text editor for you to write a commit log
 
+### Unit Tests
+We are working on building up test coverage. Current requirements are:
+* Do not drop the percentage of test coverage (exceptions will be made for large scale changes on case-by-case basis)
+* Do not break existing tests
+
+See [test coverage guidelines](src/test/README.md) for how to develop your tests.
+
 ### Submit PR
 Up to this point, all changes have been done to your local copy of Wildbook. You need to push the new commits to a remote branch to start the PR process.
 

config/indices.sql

@@ -5,11 +5,14 @@
 -- UGH, i guess _IDX (in caps!) should be what we standardize on.  that is what datanucleus does.
 --   to make matters worse, we have some places we named them explicitely in package.jdo (but those should fix themselves?)
 
+BEGIN;
+
 CREATE INDEX IF NOT EXISTS "MEDIAASSET_PARENTID_idx" ON "MEDIAASSET" ("PARENTID");
 CREATE INDEX IF NOT EXISTS "MEDIAASSET_HASHCODE_idx" ON "MEDIAASSET" ("HASHCODE");
 
 CREATE INDEX IF NOT EXISTS "ENCOUNTER_LOCATIONID_idx" ON "ENCOUNTER" ("LOCATIONID");
 CREATE INDEX IF NOT EXISTS "ENCOUNTER_STATE_idx" ON "ENCOUNTER" ("STATE");
+CREATE INDEX IF NOT EXISTS "ENCOUNTER_MODIFIED_idx" ON "ENCOUNTER" ("MODIFIED");
 CREATE INDEX IF NOT EXISTS "ENCOUNTER_INDIVIDUALID_idx" ON "ENCOUNTER" ("INDIVIDUALID");
 CREATE INDEX IF NOT EXISTS "ENCOUNTER_DATEINMILLISECONDS_idx" ON "ENCOUNTER" ("DATEINMILLISECONDS");
 CREATE INDEX IF NOT EXISTS "ENCOUNTER_DECIMALLATITUDE_idx" ON "ENCOUNTER" ("DECIMALLATITUDE");
@@ -45,3 +48,5 @@ CREATE INDEX IF NOT EXISTS "TASK_CREATED_IDX" ON "TASK" ("CREATED");
 
 INSERT INTO "RELATIONSHIP" ("RELATIONSHIP_ID", "MARKEDINDIVIDUALNAME1", "MARKEDINDIVIDUALNAME2", "MARKEDINDIVIDUALROLE1", "MARKEDINDIVIDUALROLE2", "TYPE", "STARTTIME", "ENDTIME") VALUES (0, (SELECT "INDIVIDUALID" FROM "MARKEDINDIVIDUAL" ORDER BY random() LIMIT 1), (SELECT "INDIVIDUALID" FROM "MARKEDINDIVIDUAL" ORDER BY random() LIMIT 1), 'placeholder', 'placeholder', 'placeholder-to-prevent-empty-table', 0, 0);
 
+END;
+