#5166

Committed 24 Jun 2024 06:02PM UTC coverage: 76.663% (-0.02%) from 76.68%

Build # #5166

Build Type

push

Committed by

Commit Message

DCJ-445: Update Row Helper Conditional (#2347)

Run Details

60 of 69 new or added lines in 14 files covered. (86.96%)

2 existing lines in 2 files now uncovered.

9901 of 12915 relevant lines covered (76.66%)

0.77 hits per line

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

6.06

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

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

import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.HashMap;
import java.util.Map;
import org.broadinstitute.consent.http.models.DataAccessAgreement;
import org.jdbi.v3.core.mapper.RowMapper;
import org.jdbi.v3.core.statement.StatementContext;

public class DaaMapper implements RowMapper<DataAccessAgreement>, RowMapperHelper {

  private final Map<Integer, DataAccessAgreement> daaMap = new HashMap<>();

  @Override
  public DataAccessAgreement map(ResultSet resultSet, StatementContext statementContext) throws SQLException {
    DataAccessAgreement daa;
    Integer daaId = hasNonZeroColumn(resultSet, "daa_id") ? resultSet.getInt("daa_id") : null;
    if (daaId == null) {
      if (hasNonZeroColumn(resultSet, "daa_daa_id")) {
        daaId = resultSet.getInt("daa_daa_id");
      } else {
        return null;
      }
    }
    if (daaMap.containsKey(daaId)) {
      daa = daaMap.get(resultSet.getInt("daa_id"));
    } else {
      daa = new DataAccessAgreement();
      daa.setDaaId(daaId);
    }

    if (hasNonZeroColumn(resultSet, "create_user_id")) {
      daa.setCreateUserId(resultSet.getInt("create_user_id"));
    } else if (hasNonZeroColumn(resultSet, "daa_create_user_id")) {
      daa.setCreateUserId(resultSet.getInt("daa_create_user_id"));
    }

    if (hasColumn(resultSet, "create_date")) {
      daa.setCreateDate(resultSet.getTimestamp("create_date").toInstant());
    } else if (hasColumn(resultSet, "daa_create_date")) {
      daa.setCreateDate(resultSet.getTimestamp("daa_create_date").toInstant());
    }

    if (hasNonZeroColumn(resultSet, "update_user_id")) {
      daa.setUpdateUserId(resultSet.getInt("update_user_id"));
    } else if (hasNonZeroColumn(resultSet, "daa_update_user_id")) {
      daa.setUpdateUserId(resultSet.getInt("daa_update_user_id"));
    }

    if (hasColumn(resultSet, "update_date")) {
      daa.setUpdateDate(resultSet.getTimestamp("update_date").toInstant());
    } else if (hasColumn(resultSet, "daa_update_date")) {
      daa.setUpdateDate(resultSet.getTimestamp("daa_update_date").toInstant());
    }

    if (hasNonZeroColumn(resultSet, "initial_dac_id")) {
      daa.setInitialDacId(resultSet.getInt("initial_dac_id"));
    } else if (hasNonZeroColumn(resultSet, "daa_initial_dac_id")) {
      daa.setInitialDacId(resultSet.getInt("daa_initial_dac_id"));
    }

    daaMap.put(daa.getDaaId(), daa);
    return daa;
  }
}

1	package org.broadinstitute.consent.http.db.mapper;
2
3	import java.sql.ResultSet;
4	import java.sql.SQLException;
5	import java.util.HashMap;
6	import java.util.Map;
7	import org.broadinstitute.consent.http.models.DataAccessAgreement;
8	import org.jdbi.v3.core.mapper.RowMapper;
9	import org.jdbi.v3.core.statement.StatementContext;
10
11	public class DaaMapper implements RowMapper<DataAccessAgreement>, RowMapperHelper {	1✔
12
13	private final Map<Integer, DataAccessAgreement> daaMap = new HashMap<>();	1✔
14
15	@Override
16	public DataAccessAgreement map(ResultSet resultSet, StatementContext statementContext) throws SQLException {
17	DataAccessAgreement daa;
NEW 18	Integer daaId = hasNonZeroColumn(resultSet, "daa_id") ? resultSet.getInt("daa_id") : null;	×
19	if (daaId == null) {	×
NEW 20	if (hasNonZeroColumn(resultSet, "daa_daa_id")) {	×
21	daaId = resultSet.getInt("daa_daa_id");	×
22	} else {
23	return null;	×
24	}
25	}
26	if (daaMap.containsKey(daaId)) {	×
27	daa = daaMap.get(resultSet.getInt("daa_id"));	×
28	} else {
29	daa = new DataAccessAgreement();	×
30	daa.setDaaId(daaId);	×
31	}
32
NEW 33	if (hasNonZeroColumn(resultSet, "create_user_id")) {	×
34	daa.setCreateUserId(resultSet.getInt("create_user_id"));	×
NEW 35	} else if (hasNonZeroColumn(resultSet, "daa_create_user_id")) {	×
36	daa.setCreateUserId(resultSet.getInt("daa_create_user_id"));	×
37	}
38
39	if (hasColumn(resultSet, "create_date")) {	×
40	daa.setCreateDate(resultSet.getTimestamp("create_date").toInstant());	×
41	} else if (hasColumn(resultSet, "daa_create_date")) {	×
42	daa.setCreateDate(resultSet.getTimestamp("daa_create_date").toInstant());	×
43	}
44
NEW 45	if (hasNonZeroColumn(resultSet, "update_user_id")) {	×
46	daa.setUpdateUserId(resultSet.getInt("update_user_id"));	×
NEW 47	} else if (hasNonZeroColumn(resultSet, "daa_update_user_id")) {	×
48	daa.setUpdateUserId(resultSet.getInt("daa_update_user_id"));	×
49	}
50
51	if (hasColumn(resultSet, "update_date")) {	×
52	daa.setUpdateDate(resultSet.getTimestamp("update_date").toInstant());	×
53	} else if (hasColumn(resultSet, "daa_update_date")) {	×
54	daa.setUpdateDate(resultSet.getTimestamp("daa_update_date").toInstant());	×
55	}
56
NEW 57	if (hasNonZeroColumn(resultSet, "initial_dac_id")) {	×
58	daa.setInitialDacId(resultSet.getInt("initial_dac_id"));	×
NEW 59	} else if (hasNonZeroColumn(resultSet, "daa_initial_dac_id")) {	×
60	daa.setInitialDacId(resultSet.getInt("daa_initial_dac_id"));	×
61	}
62
63	daaMap.put(daa.getDaaId(), daa);	×
64	return daa;	×
65	}
66	}

DataBiosphere / consent / #5166

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