refactors

src/timetable/assistance_atom.rs

@@ -0,0 +1,18 @@
+use serde::{Deserialize, Serialize};
+
+use crate::TimetableChange;
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(rename_all = "PascalCase")]
+pub struct AssistanceAtom {
+    pub hour_id: i64,
+    pub start: i64,
+    pub duration: i64,
+    pub class_id: Option<String>,
+    pub group_id: Option<String>,
+    pub subject_id: Option<String>,
+    pub teacher_id: Option<String>,
+    pub room_id: Option<String>,
+    pub student_id: Option<String>,
+    pub change: Option<TimetableChange>,
+}

src/timetable/assistant.rs

@@ -0,0 +1,9 @@
+use serde::{Deserialize, Serialize};
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(rename_all = "PascalCase")]
+pub struct Assistant {
+    pub id: String,
+    pub is_present: bool,
+    pub student_id: String,
+}

src/timetable/atom.rs

@@ -0,0 +1,26 @@
+use serde::{Deserialize, Serialize};
+
+use crate::{Assistant, HomeworkInfo, LessonRelease, PlannedClassification, TimetableChange};
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(rename_all = "PascalCase")]
+pub struct Atom {
+    pub hour_id: i64,
+    pub group_ids: Vec<String>,
+    pub subject_id: Option<String>,
+    pub teacher_id: Option<String>,
+    pub room_id: Option<String>,
+    pub is_last_room_lesson: bool,
+    pub cycle_ids: Vec<String>,
+    pub homeworks: Vec<HomeworkInfo>,
+    pub homework_ids: Vec<String>,
+    pub change: Option<TimetableChange>,
+    pub theme: Option<String>,
+    pub assistants: Vec<Assistant>,
+    pub notice: Option<String>,
+    pub planned_clasification: Option<PlannedClassification>,
+    pub week_theme: Option<String>,
+    pub lesson_release: LessonRelease,
+    pub start: Option<i64>,
+    pub duration: Option<i64>,
+}

src/timetable/atom_type.rs

@@ -0,0 +1,9 @@
+use serde::{Deserialize, Serialize};
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(rename_all = "PascalCase")]
+pub enum AtomType {
+    Hour,
+    Pause,
+    TimeBlock,
+}

src/timetable/change_type.rs

@@ -0,0 +1,13 @@
+use serde::{Deserialize, Serialize};
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(rename_all = "PascalCase")]
+pub enum Changetype {
+    Absence,
+    Added,
+    Canceled,
+    NoChange,
+    Removed,
+    RoomChanged,
+    Substitution,
+}

src/timetable/day.rs

@@ -0,0 +1,15 @@
+use chrono::{DateTime, FixedOffset};
+use serde::{Deserialize, Serialize};
+
+use crate::{AssistanceAtom, Atom};
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(rename_all = "PascalCase")]
+pub struct Day {
+    pub atoms: Vec<Atom>,
+    pub day_of_week: i64,
+    pub date: DateTime<FixedOffset>,
+    pub day_description: String,
+    pub day_type: DateTime<FixedOffset>,
+    pub assistance_atoms: Vec<AssistanceAtom>,
+}

src/timetable/homework_info.rs

@@ -0,0 +1,8 @@
+use serde::{Deserialize, Serialize};
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(rename_all = "PascalCase")]
+pub struct HomeworkInfo {
+    pub id: String,
+    pub text: String,
+}

src/timetable/hour.rs

@@ -0,0 +1,12 @@
+use serde::{Deserialize, Serialize};
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(rename_all = "PascalCase")]
+pub struct Hour {
+    pub id: i64,
+    pub caption: String,
+    pub begin_time: String,
+    pub end_time: String,
+    pub start: Option<i64>,
+    pub duration: Option<i64>,
+}

src/timetable/lesson_release.rs

@@ -0,0 +1,8 @@
+use serde::{Deserialize, Serialize};
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(rename_all = "PascalCase")]
+pub enum LessonRelease {
+    NoChange,
+    Released,
+}

src/timetable/mod.rs

@@ -1,5 +1,29 @@
+mod assistance_atom;
+mod assistant;
+mod atom;
+mod atom_type;
+mod change_type;
+mod day;
 mod endpoints;
+mod homework_info;
+mod hour;
+mod lesson_release;
+mod planned_classification;
 mod timetable;
+mod timetable_change;
+mod timetable_group;
 
+pub use assistance_atom::*;
+pub use assistant::*;
+pub use atom::*;
+pub use atom_type::*;
+pub use change_type::*;
+pub use day::*;
 pub use endpoints::*;
+pub use homework_info::*;
+pub use hour::*;
+pub use lesson_release::*;
+pub use planned_classification::*;
 pub use timetable::*;
+pub use timetable_change::*;
+pub use timetable_group::*;

src/timetable/planned_classification.rs

@@ -0,0 +1,7 @@
+use serde::{Deserialize, Serialize};
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(rename_all = "PascalCase")]
+pub struct PlannedClassification {
+    pub description: Option<String>,
+}

src/timetable/timetable.rs

@@ -1,5 +1,4 @@
-use crate::StdType;
-use chrono::{DateTime, FixedOffset};
+use crate::{Day, Group, Hour, StdType};
 use serde::{Deserialize, Serialize};
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
@@ -15,142 +14,3 @@ pub struct Timetable {
     pub cycles: Vec<StdType>,
     pub students: Vec<StdType>,
 }
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(rename_all = "PascalCase")]
-pub struct TimetableChange {
-    pub day: DateTime<FixedOffset>,
-    pub hours: String,
-    pub changetype: Changetype,
-    pub description: String,
-    pub time: String,
-    pub change_subject: Option<StdType>,
-    pub type_abbrev: Option<String>,
-    pub type_name: Option<String>,
-    pub atom_type: Option<AtomType>,
-    pub start: Option<i64>,
-    pub duration: Option<i64>,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(rename_all = "PascalCase")]
-pub enum Changetype {
-    Absence,
-    Added,
-    Canceled,
-    NoChange,
-    Removed,
-    RoomChanged,
-    Substitution,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(rename_all = "PascalCase")]
-pub enum AtomType {
-    Hour,
-    Pause,
-    TimeBlock,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(rename_all = "PascalCase")]
-pub struct PlannedClassification {
-    pub description: Option<String>,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(rename_all = "PascalCase")]
-pub struct HomeworkInfo {
-    pub id: String,
-    pub text: String,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(rename_all = "PascalCase")]
-pub struct Group {
-    pub class_id: Option<String>,
-    pub id: String,
-    pub abbre: Option<String>,
-    pub name: Option<String>,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(rename_all = "PascalCase")]
-pub struct Day {
-    pub atoms: Vec<Atom>,
-    pub day_of_week: i64,
-    pub date: DateTime<FixedOffset>,
-    pub day_description: String,
-    pub day_type: DateTime<FixedOffset>,
-    pub assistance_atoms: Vec<AssistanceAtom>,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(rename_all = "PascalCase")]
-pub struct Atom {
-    pub hour_id: i64,
-    pub group_ids: Vec<String>,
-    pub subject_id: Option<String>,
-    pub teacher_id: Option<String>,
-    pub room_id: Option<String>,
-    pub is_last_room_lesson: bool,
-    pub cycle_ids: Vec<String>,
-    pub homeworks: Vec<HomeworkInfo>,
-    pub homework_ids: Vec<String>,
-    pub change: Option<TimetableChange>,
-    pub theme: Option<String>,
-    pub assistants: Vec<Assistant>,
-    pub notice: Option<String>,
-    pub planned_clasification: Option<PlannedClasification>,
-    pub week_theme: Option<String>,
-    pub lesson_release: LessonRelease,
-    pub start: Option<i64>,
-    pub duration: Option<i64>,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(rename_all = "PascalCase")]
-pub enum LessonRelease {
-    NoChange,
-    Released,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(rename_all = "PascalCase")]
-pub struct Assistant {
-    pub id: String,
-    pub is_present: bool,
-    pub student_id: String,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(rename_all = "PascalCase")]
-pub struct AssistanceAtom {
-    pub hour_id: i64,
-    pub start: i64,
-    pub duration: i64,
-    pub class_id: Option<String>,
-    pub group_id: Option<String>,
-    pub subject_id: Option<String>,
-    pub teacher_id: Option<String>,
-    pub room_id: Option<String>,
-    pub student_id: Option<String>,
-    pub change: Option<TimetableChange>,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(rename_all = "PascalCase")]
-pub struct PlannedClasification {
-    pub description: Option<String>,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(rename_all = "PascalCase")]
-pub struct Hour {
-    pub id: i64,
-    pub caption: String,
-    pub begin_time: String,
-    pub end_time: String,
-    pub start: Option<i64>,
-    pub duration: Option<i64>,
-}

src/timetable/timetable_change.rs

@@ -0,0 +1,20 @@
+use chrono::{DateTime, FixedOffset};
+use serde::{Deserialize, Serialize};
+
+use crate::{AtomType, Changetype, StdType};
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(rename_all = "PascalCase")]
+pub struct TimetableChange {
+    pub day: DateTime<FixedOffset>,
+    pub hours: String,
+    pub changetype: Changetype,
+    pub description: String,
+    pub time: String,
+    pub change_subject: Option<StdType>,
+    pub type_abbrev: Option<String>,
+    pub type_name: Option<String>,
+    pub atom_type: Option<AtomType>,
+    pub start: Option<i64>,
+    pub duration: Option<i64>,
+}

src/timetable/timetable_group.rs

@@ -0,0 +1,10 @@
+use serde::{Deserialize, Serialize};
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(rename_all = "PascalCase")]
+pub struct Group {
+    pub class_id: Option<String>,
+    pub id: String,
+    pub abbre: Option<String>,
+    pub name: Option<String>,
+}