Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
cgendreau committed Dec 13, 2024
2 parents 9326b51 + c78cacf commit 025dc00
Show file tree
Hide file tree
Showing 8 changed files with 42 additions and 2 deletions.
20 changes: 19 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,27 @@
# seqdb-api

Sequence management services managing laboratory workflows leading to DNA sequences.

## Description (en)

Molecular Analysis services - Supported Workflows
* Sanger
* NGS - Whole Genome
* Metagenomics
* Generic workflow

seqdb-api is an implementation of the Sequence Module for the [DINA project](https://www.dina-project.net/).

## Description (fr)

Services d'analyse moléculaire - Flux de travail supportés

* Sanger
* NGS - Génome entier
* Métagénomique
* Flux de travail générique

seqdb-api est une implémentation du module de sequence pour le [DINA project](https://www.dina-project.net/) (anglais seulement).

## Required

* Java 21
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<groupId>ca.gc.aafc</groupId>
<artifactId>seqdb.api</artifactId>
<version>2.18.0</version>
<version>2.19.0</version>
<packaging>jar</packaging>

<name>seqdb-api</name>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ public class MolecularAnalysisRunItemDto {

private String usageType;

private String name;

@JsonApiRelation
private MolecularAnalysisRunDto run;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,9 @@ public class MolecularAnalysisRunItem implements DinaEntity {
@Column(name = "usage_type")
private String usageType;

@Size(max = 50)
private String name;

// eager since we need it for group-based permission
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name = "molecular_analysis_run_id")
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/db/changelog/db.changelog-master.xml
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,5 @@
<include file="db/changelog/migrations/55-Add_managed_attribute.xml"/>
<include file="db/changelog/migrations/56-Add_managed_attribute_to_molecular_analysis.xml"/>
<include file="db/changelog/migrations/57-Add_quality_control_table.xml"/>
<include file="db/changelog/migrations/58-Add_name_to_MolecularAnalysisRunItem.xml"/>
</databaseChangeLog>
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog
xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog https://local.xsd/dbchangelog-4.4.xsd"
objectQuotingStrategy="QUOTE_ONLY_RESERVED_WORDS">

<changeSet id="58-Add_name_to_MolecularAnalysisRunItem" context="schema-change"
author="phanm">
<addColumn tableName="molecular_analysis_run_item">
<column name="name" type="VARCHAR(50)"/>
</addColumn>
</changeSet>
</databaseChangeLog>
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ public static MolecularAnalysisRunItem.MolecularAnalysisRunItemBuilder newMolecu
.uuid(UUID.randomUUID())
.createdBy("test user")
.usageType(SeqReactionDto.TYPENAME)
.name("test-name")
.run(run);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ public static MolecularAnalysisRunItemDto newMolecularAnalysisRunItem() {
return MolecularAnalysisRunItemDto.builder()
.createdBy("test-user")
.usageType(SeqReactionDto.TYPENAME)
.name("test-name")
.build();
}
}

0 comments on commit 025dc00

Please sign in to comment.