fixes

src/others/endpoints.rs

@@ -2,13 +2,13 @@ use std::marker::PhantomData;
 
 use crate::{ApiInfo, Endpoint};
 
-pub const API_V3_INFO_ENDPOINT: Endpoint<(), ApiInfo> = Endpoint::Get {
+pub const API_V3_INFO_ENDPOINT: Endpoint<ApiInfo, ()> = Endpoint::Get {
     url: "/api/3",
     auth: false,
     _types: PhantomData,
 };
 
-pub const APIS_INFO_ENDPOINT: Endpoint<(), Vec<ApiInfo>> = Endpoint::Get {
+pub const APIS_INFO_ENDPOINT: Endpoint<Vec<ApiInfo>, ()> = Endpoint::Get {
     url: "/api",
     auth: false,
     _types: PhantomData,

src/payments/endpoints.rs

@@ -7,37 +7,37 @@ use crate::{
     RegularPrescriptionDetail, RegularPrescriptionStudent, RegularPrescriptionStudentDetail,
 };
 
-pub const CLASS_FUND_PAYMENT_INFO_ENDPOINT: Endpoint<(), ClassFundPaymentInfo> = Endpoint::Get {
+pub const CLASS_FUND_PAYMENT_INFO_ENDPOINT: Endpoint<ClassFundPaymentInfo, ()> = Endpoint::Get {
     url: "/api/3/payments/classfund/paymentsinfo",
     auth: true,
     _types: PhantomData,
 };
 
-pub const REGULAR_PAYMENTS_INFO_ENDPOINT: Endpoint<(), Vec<RegularPayment>> = Endpoint::Get {
+pub const REGULAR_PAYMENTS_INFO_ENDPOINT: Endpoint<Vec<RegularPayment>, ()> = Endpoint::Get {
     url: "/api/3/payments/regularpayments",
     auth: true,
     _types: PhantomData,
 };
 
-pub const REGULAR_PAYMENTS_SUMMARY_ENDPOINT: Endpoint<(), RegularPaymentsSummary> = Endpoint::Get {
+pub const REGULAR_PAYMENTS_SUMMARY_ENDPOINT: Endpoint<RegularPaymentsSummary, ()> = Endpoint::Get {
     url: "/api/3/payments/regularpayments/summary",
     auth: true,
     _types: PhantomData,
 };
 
-pub const CLASS_FUND_INFO_ENDPOINT: Endpoint<(), Vec<ClassFundMonthly>> = Endpoint::Get {
+pub const CLASS_FUND_INFO_ENDPOINT: Endpoint<Vec<ClassFundMonthly>, ()> = Endpoint::Get {
     url: "/api/3/payments/classfund",
     auth: true,
     _types: PhantomData,
 };
 
-pub const CLASS_FUND_SUMMARY_ENDPOINT: Endpoint<(), ClassFundSummary> = Endpoint::Get {
+pub const CLASS_FUND_SUMMARY_ENDPOINT: Endpoint<ClassFundSummary, ()> = Endpoint::Get {
     url: "/api/3/payments/classfund/summary",
     auth: true,
     _types: PhantomData,
 };
 
-pub const REGULAR_PAYMENT_DETAIL_ENDPOINT: Endpoint<(), RegularPaymentDetail> = Endpoint::Get {
+pub const REGULAR_PAYMENT_DETAIL_ENDPOINT: Endpoint<RegularPaymentDetail, ()> = Endpoint::Get {
     url: "/api/3/payments/regularpayments/detail/{paymentId}",
     auth: true,
     _types: PhantomData,
@@ -52,13 +52,13 @@ pub const CLASS_FUND_TEACHER_DOCUMENT_DETAIL_ENDPOINT: Endpoint<
     _types: PhantomData,
 };
 
-pub const REGULAR_PRESCRIPTIONS_ENDPOINT: Endpoint<(), Vec<RegularPrescription>> = Endpoint::Get {
+pub const REGULAR_PRESCRIPTIONS_ENDPOINT: Endpoint<Vec<RegularPrescription>, ()> = Endpoint::Get {
     url: "/api/3/payments/regularpayments/teacher/prescriptions",
     auth: true,
     _types: PhantomData,
 };
 
-pub const CLASS_FUND_TEACHER_STUDENTS_ENDPOINT: Endpoint<(), Vec<ClassFundTeacherStudentsItem>> =
+pub const CLASS_FUND_TEACHER_STUDENTS_ENDPOINT: Endpoint<Vec<ClassFundTeacherStudentsItem>, ()> =
     Endpoint::Get {
         url: "/api/3/payments/classfund/teacher/students/{classId}",
         auth: true,
@@ -74,14 +74,14 @@ pub const CLASS_FUND_TEACHER_DOCUMENTS_ENDPOINT: Endpoint<
     _types: PhantomData,
 };
 
-pub const CLASS_FUND_TEACHER_SUMMARY_ENDPOINT: Endpoint<(), ClassFundTeacherSummary> =
+pub const CLASS_FUND_TEACHER_SUMMARY_ENDPOINT: Endpoint<ClassFundTeacherSummary, ()> =
     Endpoint::Get {
         url: "/api/3/payments/classfund/teacher/summary",
         auth: true,
         _types: PhantomData,
     };
 
-pub const REGULAR_PRESCRIPTION_DETAIL_ENDPOINT: Endpoint<(), RegularPrescriptionDetail> =
+pub const REGULAR_PRESCRIPTION_DETAIL_ENDPOINT: Endpoint<RegularPrescriptionDetail, ()> =
     Endpoint::Get {
         url: "/api/3/payments/regularpayments/teacher/prescriptions/{prescriptionId}",
         auth: true,
@@ -97,7 +97,7 @@ pub const REGULAR_PRESCRIPTION_STUDENT_DETAIL_ENDPOINT: Endpoint<
     _types: PhantomData,
 };
 
-pub const REGULAR_PRESCRIPTION_STUDENTS_ENDPOINT: Endpoint<(), Vec<RegularPrescriptionStudent>> =
+pub const REGULAR_PRESCRIPTION_STUDENTS_ENDPOINT: Endpoint<Vec<RegularPrescriptionStudent>, ()> =
     Endpoint::Get {
         url: "/api/3/payments/regularpayments/teacher/prescriptions/{prescriptionId}/students",
         auth: true,

src/semester/endpoints.rs

@@ -12,4 +12,4 @@ pub const GET_PEDAGOGICAL_MEASURES_ENDPOINT: Endpoint<PedagogicalMeasures, ()> =
     url: "/api/3/marks/measures",
     auth: true,
     _types: PhantomData,
-};
+};

src/semester/mod.rs

@@ -1,5 +1,5 @@
-mod semester;
 mod endpoints;
+mod semester;
 
+pub use endpoints::*;
 pub use semester::*;
-pub use endpoints::*;

src/subjects/endpoints.rs

@@ -2,7 +2,7 @@ use std::marker::PhantomData;
 
 use crate::{Endpoint, Subjects};
 
-pub const SUBJECTS_ENDPOINT: Endpoint<(), Subjects> = Endpoint::Get {
+pub const SUBJECTS_ENDPOINT: Endpoint<Subjects, ()> = Endpoint::Get {
     url: "/api/3/subjects",
     auth: true,
     _types: PhantomData,

src/substitutions/endpoints.rs

@@ -2,13 +2,13 @@ use std::marker::PhantomData;
 
 use crate::{Endpoint, SubstitutionCycles, Substitutions};
 
-pub const SUBSTITUTIONS_ENDPOINT: Endpoint<(), Substitutions> = Endpoint::Get {
+pub const SUBSTITUTIONS_ENDPOINT: Endpoint<Substitutions, ()> = Endpoint::Get {
     url: "/api/3/substitutions",
     auth: true,
     _types: PhantomData,
 };
 
-pub const SUBSTITUTION_CYCLES_ENDPOINT: Endpoint<(), SubstitutionCycles> = Endpoint::Get {
+pub const SUBSTITUTION_CYCLES_ENDPOINT: Endpoint<SubstitutionCycles, ()> = Endpoint::Get {
     url: "/api/3/substitutions/cycles",
     auth: true,
     _types: PhantomData,

src/teaching/endpoints.rs

@@ -3,7 +3,7 @@ use std::marker::PhantomData;
 use crate::{Endpoint, Teaching};
 
 /// Subject ID = String
-pub const TEACHING_ENDPOINT: Endpoint<(), Teaching> = Endpoint::Get {
+pub const TEACHING_ENDPOINT: Endpoint<Teaching, ()> = Endpoint::Get {
     url: "/api/3/subjects/themes/{subjectId}",
     auth: true,
     _types: PhantomData,