Add constructors to the remaining models

Author: LostLuma

echo/src/database/pastes.rs

@@ -230,23 +230,16 @@ impl Annotation {
                 ",
             )
             .bind(file_id)
-            .bind(scan.head.line)
-            .bind(scan.head.char)
-            .bind(scan.tail.line)
-            .bind(scan.tail.char)
+            .bind(scan.head.line())
+            .bind(scan.head.char())
+            .bind(scan.tail.line())
+            .bind(scan.tail.char())
             .bind(&content)
             .execute(&mut **tx)
             .await;
 
             match result {
-                Ok(_) => {
-                    let value = Annotation {
-                        head: scan.head,
-                        tail: scan.tail,
-                        content,
-                    };
-                    annotations.push(value)
-                }
+                Ok(_) => annotations.push(Annotation::new(scan.head, scan.tail, content)),
                 Err(_) => return Err(HTTPError::new(500, "Failed to create paste.")),
             };
         }

echo/src/models/pastes.rs

@@ -10,15 +10,39 @@ use crate::result::{HTTPError, Result};
 
 #[derive(Serialize)]
 pub struct Position {
-    pub line: i32,
-    pub char: i32,
+    line: i32,
+    char: i32,
+}
+
+impl Position {
+    pub fn line(&self) -> i32 {
+        self.line
+    }
+
+    pub fn char(&self) -> i32 {
+        self.char
+    }
+
+    pub fn new(line: i32, char: i32) -> Self {
+        Position { line, char }
+    }
 }
 
 #[derive(Serialize)]
 pub struct Annotation {
-    pub head: Position,
-    pub tail: Position,
-    pub content: String,
+    head: Position,
+    tail: Position,
+    content: String,
+}
+
+impl Annotation {
+    pub fn new(head: Position, tail: Position, content: String) -> Self {
+        Annotation {
+            head,
+            tail,
+            content,
+        }
+    }
 }
 
 impl FromRow<'_, PgRow> for Annotation {

echo/src/scanners.rs

@@ -17,10 +17,7 @@ fn find_position(content: &str, position: usize) -> Position {
     let haystack = &content[0..position];
     let (idx, line) = haystack.split('\n').enumerate().last().unwrap();
 
-    Position {
-        line: idx as i32,
-        char: line.len() as i32,
-    }
+    Position::new(idx as i32, line.len() as i32)
 }
 
 pub struct ScanResult<'r> {