#6182

Committed 08 Jul 2025 07:04PM UTC coverage: 79.433% (+0.03%) from 79.402%

Build # #6182

Build Type

push

Committed by

Commit Message

DT-1934: Add Institution Domains (#2599)

Coverage Stats

109 of 119 new or added lines in 8 files covered. (91.6%)

10459 of 13167 relevant lines covered (79.43%)

0.79 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

87.5

/src/main/java/org/broadinstitute/consent/http/db/mapper/InstitutionWithUsersReducer.java

package org.broadinstitute.consent.http.db.mapper;

import java.sql.Timestamp;
import java.util.Map;
import java.util.Objects;
import org.apache.commons.lang3.StringUtils;
import org.broadinstitute.consent.http.models.Institution;
import org.broadinstitute.consent.http.models.User;
import org.broadinstitute.consent.http.service.UserService.SimplifiedUser;
import org.jdbi.v3.core.result.LinkedHashMapRowReducer;
import org.jdbi.v3.core.result.RowView;

/**
 * Set the create user and update user on an institution
 */
public class InstitutionWithUsersReducer implements LinkedHashMapRowReducer<Integer, Institution>,
    RowMapperHelper {

  @Override
  public void accumulate(Map<Integer, Institution> map, RowView rowView) {

    Institution institution = map.computeIfAbsent(
        rowView.getColumn("institution_id", Integer.class),
        id -> rowView.getRow(Institution.class));

    User create_user = new User();
    if (Objects.nonNull(rowView.getColumn("u_user_id", Integer.class))) {
      create_user = rowView.getRow(User.class);
    }

    User update_user = new User();
    update_user.setUserId(rowView.getColumn("u2_user_id", Integer.class));
    update_user.setEmail(rowView.getColumn("u2_email", String.class));
    update_user.setDisplayName(rowView.getColumn("u2_display_name", String.class));
    update_user.setCreateDate(rowView.getColumn("u2_create_date", Timestamp.class));
    update_user.setEmailPreference(rowView.getColumn("u2_email_preference", Boolean.class));
    update_user.setEraCommonsId(rowView.getColumn("u2_era_commons_id", String.class));

    institution.setCreateUser(create_user);
    institution.setUpdateUser(update_user);

    if (Objects.nonNull(rowView.getColumn("so_user_id", Integer.class))) {
      SimplifiedUser so_user = rowView.getRow(SimplifiedUser.class);
      institution.addSigningOfficial(so_user);
    }
    if (hasColumn(rowView, "domain", String.class)) {
      String domain = rowView.getColumn("domain", String.class);
      if (!StringUtils.isBlank(domain)) {
        institution.addDomain(domain);
      }
    }
  }

}

1	package org.broadinstitute.consent.http.db.mapper;
2
3	import java.sql.Timestamp;
4	import java.util.Map;
5	import java.util.Objects;
6	import org.apache.commons.lang3.StringUtils;
7	import org.broadinstitute.consent.http.models.Institution;
8	import org.broadinstitute.consent.http.models.User;
9	import org.broadinstitute.consent.http.service.UserService.SimplifiedUser;
10	import org.jdbi.v3.core.result.LinkedHashMapRowReducer;
11	import org.jdbi.v3.core.result.RowView;
12
13	/**
14	* Set the create user and update user on an institution
15	*/
16	public class InstitutionWithUsersReducer implements LinkedHashMapRowReducer<Integer, Institution>,	1✔
17	RowMapperHelper {
18
19	@Override
20	public void accumulate(Map<Integer, Institution> map, RowView rowView) {
21
22	Institution institution = map.computeIfAbsent(	1✔
23	rowView.getColumn("institution_id", Integer.class),	1✔
24	id -> rowView.getRow(Institution.class));	1✔
25
26	User create_user = new User();	1✔
27	if (Objects.nonNull(rowView.getColumn("u_user_id", Integer.class))) {	1✔
28	create_user = rowView.getRow(User.class);	1✔
29	}
30
31	User update_user = new User();	1✔
32	update_user.setUserId(rowView.getColumn("u2_user_id", Integer.class));	1✔
33	update_user.setEmail(rowView.getColumn("u2_email", String.class));	1✔
34	update_user.setDisplayName(rowView.getColumn("u2_display_name", String.class));	1✔
35	update_user.setCreateDate(rowView.getColumn("u2_create_date", Timestamp.class));	1✔
36	update_user.setEmailPreference(rowView.getColumn("u2_email_preference", Boolean.class));	1✔
37	update_user.setEraCommonsId(rowView.getColumn("u2_era_commons_id", String.class));	1✔
38
39	institution.setCreateUser(create_user);	1✔
40	institution.setUpdateUser(update_user);	1✔
41
42	if (Objects.nonNull(rowView.getColumn("so_user_id", Integer.class))) {	1✔
43	SimplifiedUser so_user = rowView.getRow(SimplifiedUser.class);	1✔
44	institution.addSigningOfficial(so_user);	1✔
45	}
46	if (hasColumn(rowView, "domain", String.class)) {	1✔
NEW 47	String domain = rowView.getColumn("domain", String.class);	×
NEW 48	if (!StringUtils.isBlank(domain)) {	×
NEW 49	institution.addDomain(domain);	×
50	}
51	}
52	}	1✔
53
54	}

DataBiosphere / consent / #6182

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous