Skip to content

Commit 0c7405c

Browse files
authored
tests/builders/version: Simplify code by adding fields to NewVersion struct (#9703)
1 parent d895454 commit 0c7405c

File tree

2 files changed

+9
-15
lines changed

2 files changed

+9
-15
lines changed

src/models/version.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,10 @@ impl Version {
8282
pub struct NewVersion<'a> {
8383
crate_id: i32,
8484
num: &'a str,
85+
#[builder(default)]
86+
created_at: Option<&'a NaiveDateTime>,
87+
#[builder(default, setter(strip_option))]
88+
yanked: Option<bool>,
8589
#[builder(
8690
default = "serde_json::Value::Object(Default::default())",
8791
setter(custom)

src/tests/builders/version.rs

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use crate::{
22
models::{Crate, NewVersion, Version},
3-
schema::{dependencies, versions},
3+
schema::dependencies,
44
util::errors::AppResult,
55
};
66
use std::collections::BTreeMap;
@@ -97,7 +97,7 @@ impl VersionBuilder {
9797
published_by: i32,
9898
connection: &mut PgConnection,
9999
) -> AppResult<Version> {
100-
use diesel::{insert_into, update};
100+
use diesel::insert_into;
101101

102102
let version = self.num.to_string();
103103

@@ -109,22 +109,12 @@ impl VersionBuilder {
109109
.checksum(&self.checksum)
110110
.links(self.links.as_deref())
111111
.rust_version(self.rust_version.as_deref())
112+
.yanked(self.yanked)
113+
.created_at(self.created_at.as_ref())
112114
.build()
113115
.map_err(|error| internal(error.to_string()))?;
114116

115-
let mut vers = new_version.save(connection, "[email protected]")?;
116-
117-
if self.yanked {
118-
vers = update(&vers)
119-
.set(versions::yanked.eq(true))
120-
.get_result(connection)?;
121-
}
122-
123-
if let Some(created_at) = self.created_at {
124-
vers = update(&vers)
125-
.set(versions::created_at.eq(created_at))
126-
.get_result(connection)?;
127-
}
117+
let vers = new_version.save(connection, "[email protected]")?;
128118

129119
let new_deps = self
130120
.dependencies

0 commit comments

Comments
 (0)