Skip to content

Commit

Permalink
Just return ID from Node::create
Browse files Browse the repository at this point in the history
  • Loading branch information
@dkhofer
dkhofer committed Sep 27, 2024
1 parent d0877b1 commit 283dad8
Show file tree
Hide file tree
Showing 10 changed files with 148 additions and 151 deletions.
24 changes: 12 additions & 12 deletions src/exports/gfa.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -234,58 +234,58 @@ mod tests {
.sequence_type("DNA")
.sequence("CCCC")
.save(&conn);
let node1 = Node::create(&conn, &sequence1.hash);
let node2 = Node::create(&conn, &sequence2.hash);
let node3 = Node::create(&conn, &sequence3.hash);
let node4 = Node::create(&conn, &sequence4.hash);
let node1_id = Node::create(&conn, &sequence1.hash);
let node2_id = Node::create(&conn, &sequence2.hash);
let node3_id = Node::create(&conn, &sequence3.hash);
let node4_id = Node::create(&conn, &sequence4.hash);

let edge1 = Edge::create(
&conn,
PATH_START_NODE_ID,
0,
Strand::Forward,
node1.id,
node1_id,
0,
Strand::Forward,
0,
0,
);
let edge2 = Edge::create(
&conn,
node1.id,
node1_id,
4,
Strand::Forward,
node2.id,
node2_id,
0,
Strand::Forward,
0,
0,
);
let edge3 = Edge::create(
&conn,
node2.id,
node2_id,
4,
Strand::Forward,
node3.id,
node3_id,
0,
Strand::Forward,
0,
0,
);
let edge4 = Edge::create(
&conn,
node3.id,
node3_id,
4,
Strand::Forward,
node4.id,
node4_id,
0,
Strand::Forward,
0,
0,
);
let edge5 = Edge::create(
&conn,
node4.id,
node4_id,
4,
Strand::Forward,
PATH_END_NODE_ID,
Expand Down
6 changes: 3 additions & 3 deletions src/imports/fasta.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,22 +64,22 @@ pub fn import_fasta(
.sequence(&sequence)
.save(conn)
};
let node = Node::create(conn, &seq.hash);
let node_id = Node::create(conn, &seq.hash);
let block_group = BlockGroup::create(conn, &collection.name, None, &name);
let edge_into = Edge::create(
conn,
PATH_START_NODE_ID,
0,
Strand::Forward,
node.id,
node_id,
0,
Strand::Forward,
0,
0,
);
let edge_out_of = Edge::create(
conn,
node.id,
node_id,
sequence_length,
Strand::Forward,
PATH_END_NODE_ID,
Expand Down
4 changes: 2 additions & 2 deletions src/imports/gfa.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ pub fn import_gfa(gfa_path: &FilePath, collection_name: &str, conn: &Connection)
.sequence(input_sequence)
.save(conn);
sequences_by_segment_id.insert(segment.id, sequence.clone());
let node = Node::create(conn, &sequence.hash);
node_ids_by_segment_id.insert(segment.id, node.id);
let node_id = Node::create(conn, &sequence.hash);
node_ids_by_segment_id.insert(segment.id, node_id);
}

let mut edges = HashSet::new();
Expand Down
80 changes: 40 additions & 40 deletions src/models/block_group.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -468,10 +468,10 @@ mod tests {
.sequence_type("DNA")
.sequence("NNNN")
.save(&conn);
let insert_node = Node::create(&conn, insert_sequence.hash.as_str());
let insert_node_id = Node::create(&conn, insert_sequence.hash.as_str());
let insert = PathBlock {
id: 0,
node_id: insert_node.id,
node_id: insert_node_id,
block_sequence: insert_sequence.get_sequence(0, 4).to_string(),
sequence_start: 0,
sequence_end: 4,
Expand Down Expand Up @@ -504,10 +504,10 @@ mod tests {
.sequence_type("DNA")
.sequence("")
.save(&conn);
let deletion_node = Node::create(&conn, deletion_sequence.hash.as_str());
let deletion_node_id = Node::create(&conn, deletion_sequence.hash.as_str());
let deletion = PathBlock {
id: 0,
node_id: deletion_node.id,
node_id: deletion_node_id,
block_sequence: deletion_sequence.get_sequence(None, None),
sequence_start: 0,
sequence_end: 0,
Expand Down Expand Up @@ -548,10 +548,10 @@ mod tests {
.sequence_type("DNA")
.sequence("NNNN")
.save(&conn);
let insert_node = Node::create(&conn, insert_sequence.hash.as_str());
let insert_node_id = Node::create(&conn, insert_sequence.hash.as_str());
let insert = PathBlock {
id: 0,
node_id: insert_node.id,
node_id: insert_node_id,
block_sequence: insert_sequence.get_sequence(0, 4).to_string(),
sequence_start: 0,
sequence_end: 4,
Expand Down Expand Up @@ -589,10 +589,10 @@ mod tests {
.sequence_type("DNA")
.sequence("NNNN")
.save(&conn);
let insert_node = Node::create(&conn, insert_sequence.hash.as_str());
let insert_node_id = Node::create(&conn, insert_sequence.hash.as_str());
let insert = PathBlock {
id: 0,
node_id: insert_node.id,
node_id: insert_node_id,
block_sequence: insert_sequence.get_sequence(0, 4).to_string(),
sequence_start: 0,
sequence_end: 4,
Expand Down Expand Up @@ -630,10 +630,10 @@ mod tests {
.sequence_type("DNA")
.sequence("NNNN")
.save(&conn);
let insert_node = Node::create(&conn, insert_sequence.hash.as_str());
let insert_node_id = Node::create(&conn, insert_sequence.hash.as_str());
let insert = PathBlock {
id: 0,
node_id: insert_node.id,
node_id: insert_node_id,
block_sequence: insert_sequence.get_sequence(0, 4).to_string(),
sequence_start: 0,
sequence_end: 4,
Expand Down Expand Up @@ -671,10 +671,10 @@ mod tests {
.sequence_type("DNA")
.sequence("NNNN")
.save(&conn);
let insert_node = Node::create(&conn, insert_sequence.hash.as_str());
let insert_node_id = Node::create(&conn, insert_sequence.hash.as_str());
let insert = PathBlock {
id: 0,
node_id: insert_node.id,
node_id: insert_node_id,
block_sequence: insert_sequence.get_sequence(0, 4).to_string(),
sequence_start: 0,
sequence_end: 4,
Expand Down Expand Up @@ -712,10 +712,10 @@ mod tests {
.sequence_type("DNA")
.sequence("NNNN")
.save(&conn);
let insert_node = Node::create(&conn, insert_sequence.hash.as_str());
let insert_node_id = Node::create(&conn, insert_sequence.hash.as_str());
let insert = PathBlock {
id: 0,
node_id: insert_node.id,
node_id: insert_node_id,
block_sequence: insert_sequence.get_sequence(0, 4).to_string(),
sequence_start: 0,
sequence_end: 4,
Expand Down Expand Up @@ -753,10 +753,10 @@ mod tests {
.sequence_type("DNA")
.sequence("NNNN")
.save(&conn);
let insert_node = Node::create(&conn, insert_sequence.hash.as_str());
let insert_node_id = Node::create(&conn, insert_sequence.hash.as_str());
let insert = PathBlock {
id: 0,
node_id: insert_node.id,
node_id: insert_node_id,
block_sequence: insert_sequence.get_sequence(0, 4).to_string(),
sequence_start: 0,
sequence_end: 4,
Expand Down Expand Up @@ -794,10 +794,10 @@ mod tests {
.sequence_type("DNA")
.sequence("NNNN")
.save(&conn);
let insert_node = Node::create(&conn, insert_sequence.hash.as_str());
let insert_node_id = Node::create(&conn, insert_sequence.hash.as_str());
let insert = PathBlock {
id: 0,
node_id: insert_node.id,
node_id: insert_node_id,
block_sequence: insert_sequence.get_sequence(0, 4).to_string(),
sequence_start: 0,
sequence_end: 4,
Expand Down Expand Up @@ -835,10 +835,10 @@ mod tests {
.sequence_type("DNA")
.sequence("NNNN")
.save(&conn);
let insert_node = Node::create(&conn, insert_sequence.hash.as_str());
let insert_node_id = Node::create(&conn, insert_sequence.hash.as_str());
let insert = PathBlock {
id: 0,
node_id: insert_node.id,
node_id: insert_node_id,
block_sequence: insert_sequence.get_sequence(0, 4).to_string(),
sequence_start: 0,
sequence_end: 4,
Expand Down Expand Up @@ -876,10 +876,10 @@ mod tests {
.sequence_type("DNA")
.sequence("")
.save(&conn);
let deletion_node = Node::create(&conn, deletion_sequence.hash.as_str());
let deletion_node_id = Node::create(&conn, deletion_sequence.hash.as_str());
let deletion = PathBlock {
id: 0,
node_id: deletion_node.id,
node_id: deletion_node_id,
block_sequence: deletion_sequence.get_sequence(None, None),
sequence_start: 0,
sequence_end: 0,
Expand Down Expand Up @@ -919,10 +919,10 @@ mod tests {
.sequence_type("DNA")
.sequence("NNNN")
.save(&conn);
let insert_node = Node::create(&conn, insert_sequence.hash.as_str());
let insert_node_id = Node::create(&conn, insert_sequence.hash.as_str());
let insert = PathBlock {
id: 0,
node_id: insert_node.id,
node_id: insert_node_id,
block_sequence: insert_sequence.get_sequence(0, 4).to_string(),
sequence_start: 0,
sequence_end: 4,
Expand Down Expand Up @@ -972,10 +972,10 @@ mod tests {
.sequence_type("DNA")
.sequence("NNNN")
.save(&conn);
let insert_node = Node::create(&conn, insert_sequence.hash.as_str());
let insert_node_id = Node::create(&conn, insert_sequence.hash.as_str());
let insert = PathBlock {
id: 0,
node_id: insert_node.id,
node_id: insert_node_id,
block_sequence: insert_sequence.get_sequence(0, 4).to_string(),
sequence_start: 0,
sequence_end: 4,
Expand Down Expand Up @@ -1014,10 +1014,10 @@ mod tests {
.sequence_type("DNA")
.sequence("NNNN")
.save(&conn);
let insert_node = Node::create(&conn, insert_sequence.hash.as_str());
let insert_node_id = Node::create(&conn, insert_sequence.hash.as_str());
let insert = PathBlock {
id: 0,
node_id: insert_node.id,
node_id: insert_node_id,
block_sequence: insert_sequence.get_sequence(0, 4).to_string(),
sequence_start: 0,
sequence_end: 4,
Expand Down Expand Up @@ -1055,10 +1055,10 @@ mod tests {
.sequence_type("DNA")
.sequence("NNNN")
.save(&conn);
let insert_node = Node::create(&conn, insert_sequence.hash.as_str());
let insert_node_id = Node::create(&conn, insert_sequence.hash.as_str());
let insert = PathBlock {
id: 0,
node_id: insert_node.id,
node_id: insert_node_id,
block_sequence: insert_sequence.get_sequence(0, 4).to_string(),
sequence_start: 0,
sequence_end: 4,
Expand Down Expand Up @@ -1096,10 +1096,10 @@ mod tests {
.sequence_type("DNA")
.sequence("NNNN")
.save(&conn);
let insert_node = Node::create(&conn, insert_sequence.hash.as_str());
let insert_node_id = Node::create(&conn, insert_sequence.hash.as_str());
let insert = PathBlock {
id: 0,
node_id: insert_node.id,
node_id: insert_node_id,
block_sequence: insert_sequence.get_sequence(0, 4).to_string(),
sequence_start: 0,
sequence_end: 4,
Expand Down Expand Up @@ -1137,10 +1137,10 @@ mod tests {
.sequence_type("DNA")
.sequence("")
.save(&conn);
let deletion_node = Node::create(&conn, deletion_sequence.hash.as_str());
let deletion_node_id = Node::create(&conn, deletion_sequence.hash.as_str());
let deletion = PathBlock {
id: 0,
node_id: deletion_node.id,
node_id: deletion_node_id,
block_sequence: deletion_sequence.get_sequence(None, None),
sequence_start: 0,
sequence_end: 0,
Expand Down Expand Up @@ -1178,10 +1178,10 @@ mod tests {
.sequence_type("DNA")
.sequence("")
.save(&conn);
let deletion_node = Node::create(&conn, deletion_sequence.hash.as_str());
let deletion_node_id = Node::create(&conn, deletion_sequence.hash.as_str());
let deletion = PathBlock {
id: 0,
node_id: deletion_node.id,
node_id: deletion_node_id,
block_sequence: deletion_sequence.get_sequence(None, None),
sequence_start: 0,
sequence_end: 0,
Expand Down Expand Up @@ -1219,10 +1219,10 @@ mod tests {
.sequence_type("DNA")
.sequence("")
.save(&conn);
let deletion_node = Node::create(&conn, deletion_sequence.hash.as_str());
let deletion_node_id = Node::create(&conn, deletion_sequence.hash.as_str());
let deletion = PathBlock {
id: 0,
node_id: deletion_node.id,
node_id: deletion_node_id,
block_sequence: deletion_sequence.get_sequence(None, None),
sequence_start: 0,
sequence_end: 0,
Expand Down Expand Up @@ -1260,10 +1260,10 @@ mod tests {
.sequence_type("DNA")
.sequence("")
.save(&conn);
let deletion_node = Node::create(&conn, deletion_sequence.hash.as_str());
let deletion_node_id = Node::create(&conn, deletion_sequence.hash.as_str());
let deletion = PathBlock {
id: 0,
node_id: deletion_node.id,
node_id: deletion_node_id,
block_sequence: deletion_sequence.get_sequence(None, None),
sequence_start: 0,
sequence_end: 0,
Expand Down
Loading

0 comments on commit 283dad8

Please sign in to comment.