Skip to content

Commit b75a4a6

Browse files
pietroalbiniTurbo87
authored andcommitted
views: Rename EncodableCrateOwnerInvitation to EncodableCrateOwnerInvitationV1
1 parent fe53fb4 commit b75a4a6

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

src/controllers/crate_owner_invitation.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use super::frontend_prelude::*;
22

33
use crate::models::{CrateOwnerInvitation, User};
44
use crate::schema::{crate_owner_invitations, crates, users};
5-
use crate::views::{EncodableCrateOwnerInvitation, EncodablePublicUser, InvitationResponse};
5+
use crate::views::{EncodableCrateOwnerInvitationV1, EncodablePublicUser, InvitationResponse};
66
use diesel::dsl::any;
77
use std::collections::HashMap;
88

@@ -62,7 +62,7 @@ pub fn list(req: &mut dyn RequestExt) -> EndpointResult {
6262
.unwrap_or_else(|| String::from("(unknown crate name)"));
6363

6464
let expires_at = invitation.expires_at(config);
65-
EncodableCrateOwnerInvitation::from(invitation, inviter_name, crate_name, expires_at)
65+
EncodableCrateOwnerInvitationV1::from(invitation, inviter_name, crate_name, expires_at)
6666
})
6767
.collect();
6868

@@ -74,7 +74,7 @@ pub fn list(req: &mut dyn RequestExt) -> EndpointResult {
7474

7575
#[derive(Serialize)]
7676
struct R {
77-
crate_owner_invitations: Vec<EncodableCrateOwnerInvitation>,
77+
crate_owner_invitations: Vec<EncodableCrateOwnerInvitationV1>,
7878
users: Vec<EncodablePublicUser>,
7979
}
8080
Ok(req.json(&R {

src/tests/owners.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use crate::{
88
use cargo_registry::{
99
models::Crate,
1010
views::{
11-
EncodableCrateOwnerInvitation, EncodableOwner, EncodablePublicUser, InvitationResponse,
11+
EncodableCrateOwnerInvitationV1, EncodableOwner, EncodablePublicUser, InvitationResponse,
1212
},
1313
Emails,
1414
};
@@ -27,7 +27,7 @@ struct UserResponse {
2727
}
2828
#[derive(Deserialize, Debug, PartialEq, Eq)]
2929
struct InvitationListResponse {
30-
crate_owner_invitations: Vec<EncodableCrateOwnerInvitation>,
30+
crate_owner_invitations: Vec<EncodableCrateOwnerInvitationV1>,
3131
users: Vec<EncodablePublicUser>,
3232
}
3333

@@ -447,7 +447,7 @@ fn invitations_list() {
447447
assert_eq!(
448448
invitations,
449449
InvitationListResponse {
450-
crate_owner_invitations: vec![EncodableCrateOwnerInvitation {
450+
crate_owner_invitations: vec![EncodableCrateOwnerInvitationV1 {
451451
crate_id: krate.id,
452452
crate_name: krate.name,
453453
invited_by_username: owner.gh_login.clone(),
@@ -482,7 +482,7 @@ fn invitations_list_does_not_include_expired_invites() {
482482
assert_eq!(
483483
invitations,
484484
InvitationListResponse {
485-
crate_owner_invitations: vec![EncodableCrateOwnerInvitation {
485+
crate_owner_invitations: vec![EncodableCrateOwnerInvitationV1 {
486486
crate_id: krate2.id,
487487
crate_name: krate2.name,
488488
invited_by_username: owner.gh_login.clone(),

src/views.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ pub struct EncodableCategoryWithSubcategories {
7474

7575
/// The serialization format for the `CrateOwnerInvitation` model.
7676
#[derive(Deserialize, Serialize, Debug, PartialEq, Eq)]
77-
pub struct EncodableCrateOwnerInvitation {
77+
pub struct EncodableCrateOwnerInvitationV1 {
7878
pub invitee_id: i32,
7979
pub inviter_id: i32,
8080
pub invited_by_username: String,
@@ -86,7 +86,7 @@ pub struct EncodableCrateOwnerInvitation {
8686
pub expires_at: NaiveDateTime,
8787
}
8888

89-
impl EncodableCrateOwnerInvitation {
89+
impl EncodableCrateOwnerInvitationV1 {
9090
pub fn from(
9191
invitation: CrateOwnerInvitation,
9292
inviter_name: String,
@@ -801,7 +801,7 @@ mod tests {
801801

802802
#[test]
803803
fn crate_owner_invitation_serializes_to_rfc3339() {
804-
let inv = EncodableCrateOwnerInvitation {
804+
let inv = EncodableCrateOwnerInvitationV1 {
805805
invitee_id: 1,
806806
inviter_id: 2,
807807
invited_by_username: "".to_string(),

0 commit comments

Comments
 (0)