Add KP role filter in grant sql

pass-grant-loader/src/main/java/org/eclipse/pass/support/grant/data/jhu/JhuGrantDbConnector.java

@@ -105,6 +105,7 @@ public class JhuGrantDbConnector implements GrantConnector {
         "WHERE A.inst_proposal = B.inst_proposal " +
         "AND B.employee_id = C.employee_id " +
         "AND A.AWARD_END_DATE >= '2011-01-01' "  +
+        "AND B.ROLE != 'KP' "  +
         "AND EXISTS (" +
         "    select * from JHU_PASS_AWD_VIEW EA where" +
         "        EA.UPDATE_TIMESTAMP > ?" +
@@ -123,7 +124,6 @@ public class JhuGrantDbConnector implements GrantConnector {
             "FROM JHU_PERSON_VIEW A, " +
             "JHU_FIBI_IP_INV_VIEW B " +
             "WHERE A.employee_id = B.employee_id " +
-            // todo need reply from Bob on this
             "and A.UPDATE_TIMESTAMP > ?";
 
     private static final String SELECT_FUNDER_SQL =
@@ -136,8 +136,7 @@ public class JhuGrantDbConnector implements GrantConnector {
     private final Map<String, String> jhuGrantDbRoleMapping = Map.of(
         "PI", "P",
         "Co-PI", "C",
-        "Co-I", "C",
-        "KP", "C"
+        "Co-I", "C"
     );
 
     @Value("${grant.db.url}")

pass-grant-loader/src/test/java/org/eclipse/pass/support/grant/data/jhu/JhuGrantDbConnectorTest.java

@@ -47,6 +47,11 @@ public void testGrantQuery() throws SQLException {
         assertEquals(2, actualAwardNums.size());
         assertTrue(actualAwardNums.contains("B10000000"));
         assertTrue(actualAwardNums.contains("B10000003"));
+        // Verify KP user is not in result set
+        List<String> actualPiEmails = results.stream().map(GrantIngestRecord::getPiEmail).distinct().toList();
+        assertEquals(2, actualPiEmails.size());
+        assertTrue(actualPiEmails.contains("[email protected]"));
+        assertTrue(actualPiEmails.contains("[email protected]"));
     }
 
     @Test

pass-grant-loader/src/test/resources/data.sql

@@ -13,11 +13,15 @@ INSERT INTO JHU_FIBI_IP_INV_VIEW (INST_PROPOSAL, EMPLOYEE_ID, ROLE)
 VALUES ('1', '31000000', 'PI');
 INSERT INTO JHU_FIBI_IP_INV_VIEW (INST_PROPOSAL, EMPLOYEE_ID, ROLE)
 VALUES ('1', '31000001', 'Co-I');
+INSERT INTO JHU_FIBI_IP_INV_VIEW (INST_PROPOSAL, EMPLOYEE_ID, ROLE)
+VALUES ('1', '31000002', 'KP');
 
 INSERT INTO JHU_PERSON_VIEW (EMPLOYEE_ID, FIRST_NAME, MIDDLE_NAME, LAST_NAME, EMAIL_ADDRESS, JHED_ID, UPDATE_TIMESTAMP)
 VALUES ('31000000', 'Amanda', 'Bea', 'Reckondwith', '[email protected]', 'arecko1', '2022-03-11 00:00:00.0');
 INSERT INTO JHU_PERSON_VIEW (EMPLOYEE_ID, FIRST_NAME, MIDDLE_NAME, LAST_NAME, EMAIL_ADDRESS, JHED_ID, UPDATE_TIMESTAMP)
 VALUES ('31000001', 'Skip', 'Avery', 'Class', '[email protected]', 'sclass1', '2023-03-11 00:00:00.0');
+INSERT INTO JHU_PERSON_VIEW (EMPLOYEE_ID, FIRST_NAME, MIDDLE_NAME, LAST_NAME, EMAIL_ADDRESS, JHED_ID, UPDATE_TIMESTAMP)
+VALUES ('31000002', 'John', null, 'Doe', '[email protected]', 'jdoe1', '2022-03-11 00:00:00.0');
 
 INSERT INTO JHU_PASS_AWD_VIEW (INST_PROPOSAL, AWARD_ID, AWARD_STATUS, SAP_GRANT_NUMBER, TITLE, AWARD_DATE, AWARD_START_DATE,
                                AWARD_END_DATE, SPONSOR_CODE, SPONSOR_NAME, PRIME_SPONSOR_CODE, PRIME_SPONSOR_NAME,