zj/nidobyte - Change YZAHAQRQHK24QY2H3AXKCPPDIE2F53H35C5CNYUSXRDSNCWOUJVQC

refactor: Don't leak rocket::State into models Previously the State was passed into the models where it had no reason to be. So a minor cleanup has been performed to right this.

Created by zj on October 26, 2021

YZAHAQRQHK24QY2H3AXKCPPDIE2F53H35C5CNYUSXRDSNCWOUJVQC

Dependencies

In channels

main

Change contents

Replacement in "src/models/users.rs" at line 19 [4.2044]
B:BD[2.67] → [2.67:97]
```
        db: &State<Database>,
```
[2.67]
[2.97]
```
        db: &Database,
```
Replacement in "src/models/users.rs" at line 30 [4.2044]
B:BD[4.2733] → [4.2733:2759]
```
        .fetch_one(&**db)
```
[4.2733]
[4.2759]
```
        .fetch_one(db)
```

Replacement in "src/models/users.rs" at line 36 [4.2044]

B:BD[2.458] → [2.458:542]

    pub async fn find(db: &State<Database>, id: i32) -> Result<Self, sqlx::Error> {

[2.458]

[2.542]

    pub async fn find(db: &Database, id: i32) -> Result<Self, sqlx::Error> {

Replacement in "src/models/users.rs" at line 38 [4.2044]
B:BD[2.607] → [2.607:637]
```
            .fetch_one(&**db)
```
[2.607]
[2.637]
```
            .fetch_one(db)
```
Replacement in "src/models/users.rs" at line 45 [4.2044]
B:BD[4.2995] → [4.2995:3025]
```
        db: &State<Database>,
```
[4.2995]
[4.3025]
```
        db: &Database,
```
Replacement in "src/models/users.rs" at line 55 [4.2044]
B:BD[4.3303] → [4.3303:3334]
```
        .fetch_optional(&**db)
```
[4.3303]
[4.3334]
```
        .fetch_optional(db)
```
Deletion in "src/models/projects.rs" at line 3 [4.3416]
B:BD[4.3493] → [4.3493:3512]
```
use rocket::State;
```

Replacement in "src/models/projects.rs" at line 14 [4.3416]

B:BD[5.1425] → [5.1425:1523]

pub async fn find(db: &State<Database>, org_path: String, proj_path: String) -> Option<Project> {

[5.1425]

[5.1523]

pub async fn find(db: &Database, org_path: String, proj_path: String) -> Option<Project> {

Replacement in "src/models/projects.rs" at line 17 [4.3416]

B:BD[5.1669] → [6.819:870]

        proj_path, org_path).fetch_optional(&**db)

[5.1669]

[5.1712]

        proj_path, org_path).fetch_optional(db)

Replacement in "src/models/projects.rs" at line 23 [4.3416]

B:BD[5.1749] → [6.871:950]

pub async fn list(db: &State<Database>) -> Result<Vec<Project>, sqlx::Error> {

[5.1749]

[6.950]

pub async fn list(db: &Database) -> Result<Vec<Project>, sqlx::Error> {

Replacement in "src/models/projects.rs" at line 25 [4.3416]
B:BD[6.1005] → [6.1005:1031]
```
        .fetch_all(&**db)
```
[6.1005]
[6.1031]
```
        .fetch_all(db)
```
Replacement in "src/models/projects.rs" at line 30 [4.3416]
B:BD[5.1770] → [5.1770:1796]
```
    db: &State<Database>,
```
[5.1770]
[5.1796]
```
    db: &Database,
```
Replacement in "src/models/projects.rs" at line 40 [4.3416]
B:BD[5.2044] → [5.2044:2066]
```
    .fetch_one(&**db)
```
[5.2044]
[5.2066]
```
    .fetch_one(db)
```

Replacement in "src/models/projects.rs" at line 52 [4.3416]

B:BD[4.3728] → [6.1083:1160]

    pub async fn organisation(&self, db: &State<Database>) -> Result<User> {

[4.3728]

[3.1195]

    pub async fn organisation(&self, db: &Database) -> Result<User> {

Replacement in "src/models/projects.rs" at line 56 [4.3416]

B:BD[3.1231] → [3.1231:1301]

    pub async fn owner(&self, db: &State<Database>) -> Result<User> {

[3.1231]

[6.1160]

    pub async fn owner(&self, db: &Database) -> Result<User> {

Replacement in "src/models/projects.rs" at line 83 [4.3416]

B:BD[6.1404] → [6.1404:1475]

    pub async fn new(db: &State<Database>, project: Project) -> Self {

[6.1404]

[6.1475]

    pub async fn new(db: &Database, project: Project) -> Self {

Replacement in "src/models/pijul/repositories.rs" at line 164 [5.2571]

B:BD[3.1874] → [3.1874:1960]

    pub async fn owner(&self, db: &rocket::State<Database>) -> anyhow::Result<User> {

[3.1874]

[3.1960]

    pub async fn owner(&self, db: &Database) -> anyhow::Result<User> {

Replacement in "src/controllers/projects.rs" at line 50 [7.36]

B:BD[7.1107] → [7.1107:1177]

    match projects::create(db, user.id, project.name.clone()).await {

[7.1107]

[7.1177]

    match projects::create(&**db, user.id, project.name.clone()).await {

Replacement in "src/controllers/projects.rs" at line 66 [7.36]

B:BD[6.2024] → [6.2024:2101]

    let p = if let Some(p) = projects::find(db, org_path, proj_path).await {

[6.2024]

[6.2101]

    let p = if let Some(p) = projects::find(&**db, org_path, proj_path).await {

Replacement in "src/controllers/projects.rs" at line 76 [7.36]

B:BD[6.2303] → [6.2303:2360]

            organisation: p.organisation(db).await.ok(),

[6.2303]

[6.2360]

            organisation: p.organisation(&**db).await.ok(),

Replacement in "src/controllers/projects.rs" at line 87 [7.36]

B:BD[6.2532] → [6.2532:2609]

    let p = if let Some(p) = projects::find(db, org_path, proj_path).await {

[6.2532]

[6.2609]

    let p = if let Some(p) = projects::find(&**db, org_path, proj_path).await {

Replacement in "src/controllers/projects.rs" at line 98 [7.36]

B:BD[6.2843] → [6.2843:2900]

            organisation: p.organisation(db).await.ok(),

[6.2843]

[6.2900]

            organisation: p.organisation(&**db).await.ok(),

Replacement in "src/controllers/projects.rs" at line 110 [7.36]

B:BD[6.3091] → [6.3091:3159]

    let projects = if let Ok(projects) = projects::list(db).await {

[6.3091]

[6.3159]

    let projects = if let Ok(projects) = projects::list(&**db).await {

Replacement in "src/controllers/projects.rs" at line 118 [7.36]

B:BD[6.3325] → [6.3325:3395]

        disp.push(projects::DispProject::new(db, proj.clone()).await)

[6.3325]

[8.4657]

        disp.push(projects::DispProject::new(&**db, proj.clone()).await)

refactor: Don't leak rocket::State into models Previously the State was passed into the models where it had no reason to be. So a minor cleanup has been performed to right this.

Dependencies

In channels

Change contents

Replacement in "src/models/users.rs" at line 19 [4.2044]

Replacement in "src/models/users.rs" at line 30 [4.2044]

Replacement in "src/models/users.rs" at line 36 [4.2044]

Replacement in "src/models/users.rs" at line 38 [4.2044]

Replacement in "src/models/users.rs" at line 45 [4.2044]

Replacement in "src/models/users.rs" at line 55 [4.2044]

Deletion in "src/models/projects.rs" at line 3 [4.3416]