From 1ccb3787b67523996183c0d8d56a600f581e4c1c Mon Sep 17 00:00:00 2001 From: zervo Date: Fri, 22 Nov 2024 08:10:38 +0100 Subject: [PATCH] Fix imports --- internal/requests/get_classes.go | 2 +- internal/requests/get_generic_selection.go | 2 +- internal/requests/get_rooms.go | 2 +- internal/requests/get_schools.go | 2 +- internal/requests/get_students.go | 2 +- internal/requests/get_teachers.go | 2 +- internal/requests/get_terms.go | 2 +- skola24api.go | 4 ++-- {pkg/goskola24api/types => types}/classes.go | 0 {pkg/goskola24api/types => types}/rooms.go | 0 {pkg/goskola24api/types => types}/schools.go | 0 {pkg/goskola24api/types => types}/teachers.go | 0 {pkg/goskola24api/types => types}/terms.go | 0 13 files changed, 9 insertions(+), 9 deletions(-) rename {pkg/goskola24api/types => types}/classes.go (100%) rename {pkg/goskola24api/types => types}/rooms.go (100%) rename {pkg/goskola24api/types => types}/schools.go (100%) rename {pkg/goskola24api/types => types}/teachers.go (100%) rename {pkg/goskola24api/types => types}/terms.go (100%) diff --git a/internal/requests/get_classes.go b/internal/requests/get_classes.go index e22859a..223a310 100644 --- a/internal/requests/get_classes.go +++ b/internal/requests/get_classes.go @@ -28,7 +28,7 @@ import ( "errors" "git.zervo.org/zervo/GoSkola24API/internal/types" - pubtypes "git.zervo.org/zervo/GoSkola24API/pkg/goskola24api/types" + pubtypes "git.zervo.org/zervo/GoSkola24API/types" ) func GetClasses(school pubtypes.School, checkAvailability bool) (_result []pubtypes.Class, _error error) { diff --git a/internal/requests/get_generic_selection.go b/internal/requests/get_generic_selection.go index 1379797..5c8838b 100644 --- a/internal/requests/get_generic_selection.go +++ b/internal/requests/get_generic_selection.go @@ -29,7 +29,7 @@ import ( "git.zervo.org/zervo/GoSkola24API/internal/types" "git.zervo.org/zervo/GoSkola24API/internal/utility" - pubtypes "git.zervo.org/zervo/GoSkola24API/pkg/goskola24api/types" + pubtypes "git.zervo.org/zervo/GoSkola24API/types" ) func GetGenericSelection(school pubtypes.School, filters types.RequestFilters) (_result map[string]interface{}, _error error) { diff --git a/internal/requests/get_rooms.go b/internal/requests/get_rooms.go index 89dcdf6..5dab71b 100644 --- a/internal/requests/get_rooms.go +++ b/internal/requests/get_rooms.go @@ -28,7 +28,7 @@ import ( "errors" "git.zervo.org/zervo/GoSkola24API/internal/types" - pubtypes "git.zervo.org/zervo/GoSkola24API/pkg/goskola24api/types" + pubtypes "git.zervo.org/zervo/GoSkola24API/types" ) func GetRooms(school pubtypes.School, checkAvailability bool) (_result []pubtypes.Room, _error error) { diff --git a/internal/requests/get_schools.go b/internal/requests/get_schools.go index e8bcb44..6f18684 100644 --- a/internal/requests/get_schools.go +++ b/internal/requests/get_schools.go @@ -31,7 +31,7 @@ import ( "git.zervo.org/zervo/GoSkola24API/internal/types" "git.zervo.org/zervo/GoSkola24API/internal/utility" - pubtypes "git.zervo.org/zervo/GoSkola24API/pkg/goskola24api/types" + pubtypes "git.zervo.org/zervo/GoSkola24API/types" ) func GetSchools(api_host string) (_result []pubtypes.School, _error error) { diff --git a/internal/requests/get_students.go b/internal/requests/get_students.go index d172816..fa92311 100644 --- a/internal/requests/get_students.go +++ b/internal/requests/get_students.go @@ -28,7 +28,7 @@ import ( "errors" "git.zervo.org/zervo/GoSkola24API/internal/types" - pubtypes "git.zervo.org/zervo/GoSkola24API/pkg/goskola24api/types" + pubtypes "git.zervo.org/zervo/GoSkola24API/types" ) // TODO: Create and implement proper students type once we have data diff --git a/internal/requests/get_teachers.go b/internal/requests/get_teachers.go index df950d9..070e6d8 100644 --- a/internal/requests/get_teachers.go +++ b/internal/requests/get_teachers.go @@ -28,7 +28,7 @@ import ( "errors" "git.zervo.org/zervo/GoSkola24API/internal/types" - pubtypes "git.zervo.org/zervo/GoSkola24API/pkg/goskola24api/types" + pubtypes "git.zervo.org/zervo/GoSkola24API/types" ) func GetTeachers(school pubtypes.School, checkAvailability bool) (_result []pubtypes.Teacher, _error error) { diff --git a/internal/requests/get_terms.go b/internal/requests/get_terms.go index 3d7f026..796c313 100644 --- a/internal/requests/get_terms.go +++ b/internal/requests/get_terms.go @@ -29,7 +29,7 @@ import ( "git.zervo.org/zervo/GoSkola24API/internal/types" "git.zervo.org/zervo/GoSkola24API/internal/utility" - pubtypes "git.zervo.org/zervo/GoSkola24API/pkg/goskola24api/types" + pubtypes "git.zervo.org/zervo/GoSkola24API/types" ) func GetTerms(api_host string) (_result pubtypes.Terms, _error error) { diff --git a/skola24api.go b/skola24api.go index 910f651..b43f93b 100644 --- a/skola24api.go +++ b/skola24api.go @@ -22,11 +22,11 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . */ -package goskola24api +package GoSkola24API import ( "git.zervo.org/zervo/GoSkola24API/internal/requests" - pubtypes "git.zervo.org/zervo/GoSkola24API/pkg/goskola24api/types" + pubtypes "git.zervo.org/zervo/GoSkola24API/types" ) type Skola24API struct { diff --git a/pkg/goskola24api/types/classes.go b/types/classes.go similarity index 100% rename from pkg/goskola24api/types/classes.go rename to types/classes.go diff --git a/pkg/goskola24api/types/rooms.go b/types/rooms.go similarity index 100% rename from pkg/goskola24api/types/rooms.go rename to types/rooms.go diff --git a/pkg/goskola24api/types/schools.go b/types/schools.go similarity index 100% rename from pkg/goskola24api/types/schools.go rename to types/schools.go diff --git a/pkg/goskola24api/types/teachers.go b/types/teachers.go similarity index 100% rename from pkg/goskola24api/types/teachers.go rename to types/teachers.go diff --git a/pkg/goskola24api/types/terms.go b/types/terms.go similarity index 100% rename from pkg/goskola24api/types/terms.go rename to types/terms.go