#5390

Committed 21 Oct 2024 02:35PM UTC coverage: 78.466%. Remained the same

Build # #5390

Build Type

push

Committed by

Commit Message

[DCJ-702] Switch to datasetId everywhere (#2411)

Run Details

61 of 85 new or added lines in 26 files covered. (71.76%)

2 existing lines in 2 files now uncovered.

9864 of 12571 relevant lines covered (78.47%)

0.78 hits per line

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

86.11

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

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

import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.Map;
import org.broadinstitute.consent.http.models.dto.DatasetDTO;
import org.broadinstitute.consent.http.models.dto.DatasetPropertyDTO;
import org.jdbi.v3.core.mapper.RowMapper;
import org.jdbi.v3.core.statement.StatementContext;

public class DatasetDTOWithPropertiesMapper implements RowMapper<DatasetDTO>, RowMapperHelper {

  private final Map<Integer, DatasetDTO> datasetDTOs = new LinkedHashMap<>();
  private static final String PROPERTY_KEY = "key";
  private static final String PROPERTY_PROPERTYVALUE = "property_value";
  private final DataUseParser dataUseParser = new DataUseParser();

  public DatasetDTO map(ResultSet r, StatementContext ctx) throws SQLException {

    DatasetDTO datasetDTO;
    Integer datasetId = r.getInt("dataset_id");
    Integer alias = r.getInt("alias");
    if (!datasetDTOs.containsKey(datasetId)) {
      datasetDTO = new DatasetDTO(new ArrayList<>());
      if (hasNonZeroColumn(r, "dac_id")) {
        datasetDTO.setDacId(r.getInt("dac_id"));
      }
      datasetDTO.setAlias(alias);
      datasetDTO.setDatasetId(datasetId);
      if (hasColumn(r, "data_use")) {
        datasetDTO.setDataUse(dataUseParser.parseDataUse(r.getString("data_use")));
      }
      if (hasColumn(r, "create_date")) {
        datasetDTO.setCreateDate(r.getDate("create_date"));
      }
      if (hasNonZeroColumn(r, "create_user_id")) {
        datasetDTO.setCreateUserId(r.getInt("create_user_id"));
      }
      if (hasColumn(r, "update_date")) {
        datasetDTO.setUpdateDate(r.getTimestamp("update_date"));
      }
      if (hasNonZeroColumn(r, "update_user_id")) {
        datasetDTO.setUpdateUserId(r.getInt("update_user_id"));
      }
      DatasetPropertyDTO property = new DatasetPropertyDTO("Dataset Name", r.getString("name"));
      datasetDTO.addProperty(property);
      property =
          new DatasetPropertyDTO(r.getString(PROPERTY_KEY), r.getString(PROPERTY_PROPERTYVALUE));
      if (property.getPropertyName() != null) {
        datasetDTO.addProperty(property);
      }
      datasetDTO.setObjectId(r.getString("object_id"));
      datasetDTOs.put(datasetId, datasetDTO);
    } else {
      datasetDTO = datasetDTOs.get(datasetId);
      DatasetPropertyDTO property =
          new DatasetPropertyDTO(r.getString(PROPERTY_KEY), r.getString(PROPERTY_PROPERTYVALUE));
      if (property.getPropertyName() != null) {
        datasetDTO.addProperty(property);
      }
    }
    return datasetDTO;
  }
}

1	package org.broadinstitute.consent.http.db.mapper;
2
3	import java.sql.ResultSet;
4	import java.sql.SQLException;
5	import java.util.ArrayList;
6	import java.util.LinkedHashMap;
7	import java.util.Map;
8	import org.broadinstitute.consent.http.models.dto.DatasetDTO;
9	import org.broadinstitute.consent.http.models.dto.DatasetPropertyDTO;
10	import org.jdbi.v3.core.mapper.RowMapper;
11	import org.jdbi.v3.core.statement.StatementContext;
12
13	public class DatasetDTOWithPropertiesMapper implements RowMapper<DatasetDTO>, RowMapperHelper {	1✔
14
15	private final Map<Integer, DatasetDTO> datasetDTOs = new LinkedHashMap<>();	1✔
16	private static final String PROPERTY_KEY = "key";
17	private static final String PROPERTY_PROPERTYVALUE = "property_value";
18	private final DataUseParser dataUseParser = new DataUseParser();	1✔
19
20	public DatasetDTO map(ResultSet r, StatementContext ctx) throws SQLException {
21
22	DatasetDTO datasetDTO;
23	Integer datasetId = r.getInt("dataset_id");	1✔
24	Integer alias = r.getInt("alias");	1✔
25	if (!datasetDTOs.containsKey(datasetId)) {	1✔
26	datasetDTO = new DatasetDTO(new ArrayList<>());	1✔
27	if (hasNonZeroColumn(r, "dac_id")) {	1✔
28	datasetDTO.setDacId(r.getInt("dac_id"));	1✔
29	}
30	datasetDTO.setAlias(alias);	1✔
31	datasetDTO.setDatasetId(datasetId);	1✔
32	if (hasColumn(r, "data_use")) {	1✔
33	datasetDTO.setDataUse(dataUseParser.parseDataUse(r.getString("data_use")));	1✔
34	}
35	if (hasColumn(r, "create_date")) {	1✔
36	datasetDTO.setCreateDate(r.getDate("create_date"));	1✔
37	}
38	if (hasNonZeroColumn(r, "create_user_id")) {	1✔
39	datasetDTO.setCreateUserId(r.getInt("create_user_id"));	1✔
40	}
41	if (hasColumn(r, "update_date")) {	1✔
42	datasetDTO.setUpdateDate(r.getTimestamp("update_date"));	1✔
43	}
44	if (hasNonZeroColumn(r, "update_user_id")) {	1✔
45	datasetDTO.setUpdateUserId(r.getInt("update_user_id"));	1✔
46	}
47	DatasetPropertyDTO property = new DatasetPropertyDTO("Dataset Name", r.getString("name"));	1✔
48	datasetDTO.addProperty(property);	1✔
49	property =	1✔
50	new DatasetPropertyDTO(r.getString(PROPERTY_KEY), r.getString(PROPERTY_PROPERTYVALUE));	1✔
51	if (property.getPropertyName() != null) {	1✔
52	datasetDTO.addProperty(property);	1✔
53	}
54	datasetDTO.setObjectId(r.getString("object_id"));	1✔
55	datasetDTOs.put(datasetId, datasetDTO);	1✔
56	} else {	1✔
NEW 57	datasetDTO = datasetDTOs.get(datasetId);	×
58	DatasetPropertyDTO property =	×
59	new DatasetPropertyDTO(r.getString(PROPERTY_KEY), r.getString(PROPERTY_PROPERTYVALUE));	×
60	if (property.getPropertyName() != null) {	×
61	datasetDTO.addProperty(property);	×
62	}
63	}
64	return datasetDTO;	1✔
65	}
66	}

DataBiosphere / consent / #5390

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