chore: re-package

server/internal/controller/battle.go

@@ -7,8 +7,9 @@ import (
 	"math/rand/v2"
 	"slices"
 
+	"galaxy/server/internal/model/game"
+
 	"github.com/google/uuid"
-	"github.com/iliadenisov/galaxy/server/internal/model/game"
 )
 
 type Battle struct {

server/internal/controller/battle_test.go

@@ -5,8 +5,9 @@ import (
 	"slices"
 	"testing"
 
-	"github.com/iliadenisov/galaxy/server/internal/controller"
-	"github.com/iliadenisov/galaxy/server/internal/model/game"
+	"galaxy/server/internal/controller"
+	"galaxy/server/internal/model/game"
+
 	"github.com/stretchr/testify/assert"
 )
 

server/internal/controller/bombing.go

@@ -1,8 +1,9 @@
 package controller
 
 import (
+	"galaxy/server/internal/model/game"
+
 	"github.com/google/uuid"
-	"github.com/iliadenisov/galaxy/server/internal/model/game"
 )
 
 func (c *Cache) ProduceBombings() []*game.Bombing {

server/internal/controller/bombing_test.go

@@ -3,9 +3,10 @@ package controller_test
 import (
 	"testing"
 
+	"galaxy/server/internal/controller"
+	"galaxy/server/internal/model/game"
+
 	"github.com/google/uuid"
-	"github.com/iliadenisov/galaxy/server/internal/controller"
-	"github.com/iliadenisov/galaxy/server/internal/model/game"
 	"github.com/stretchr/testify/assert"
 )
 

server/internal/controller/cache.go

@@ -4,8 +4,9 @@ import (
 	"fmt"
 	"slices"
 
+	"galaxy/server/internal/model/game"
+
 	"github.com/google/uuid"
-	"github.com/iliadenisov/galaxy/server/internal/model/game"
 )
 
 type Cache struct {

server/internal/controller/command.go

@@ -5,8 +5,9 @@ import (
 
 	e "galaxy/error"
 
+	"galaxy/server/internal/model/game"
+
 	"github.com/google/uuid"
-	"github.com/iliadenisov/galaxy/server/internal/model/game"
 )
 
 // RaceID returns ID of race with given actor's name or error when race not found or extinct

server/internal/controller/controller.go

@@ -3,13 +3,14 @@ package controller
 import (
 	"errors"
 
+	"galaxy/server/internal/model/game"
+
 	"github.com/google/uuid"
-	"github.com/iliadenisov/galaxy/server/internal/model/game"
 
 	"galaxy/model/order"
 	"galaxy/model/report"
 
-	"github.com/iliadenisov/galaxy/server/internal/repo"
+	"galaxy/server/internal/repo"
 )
 
 type Configurer func(*Param)

server/internal/controller/controller_export_test.go

@@ -5,8 +5,9 @@ import (
 
 	e "galaxy/error"
 
+	"galaxy/server/internal/model/game"
+
 	"github.com/google/uuid"
-	"github.com/iliadenisov/galaxy/server/internal/model/game"
 )
 
 func (c *Cache) CreateShips(ri int, shipTypeName string, planetNumber uint, quantity int) error {

server/internal/controller/controller_test.go

@@ -3,9 +3,10 @@ package controller_test
 import (
 	"fmt"
 
+	"galaxy/server/internal/controller"
+	"galaxy/server/internal/model/game"
+
 	"github.com/google/uuid"
-	"github.com/iliadenisov/galaxy/server/internal/controller"
-	"github.com/iliadenisov/galaxy/server/internal/model/game"
 )
 
 var (

server/internal/controller/fleet.go

@@ -10,8 +10,9 @@ import (
 
 	e "galaxy/error"
 
+	"galaxy/server/internal/model/game"
+
 	"github.com/google/uuid"
-	"github.com/iliadenisov/galaxy/server/internal/model/game"
 )
 
 var fleetStateNil = game.ShipGroupState("-")

server/internal/controller/fleet_send.go

@@ -5,7 +5,7 @@ import (
 
 	e "galaxy/error"
 
-	"github.com/iliadenisov/galaxy/server/internal/model/game"
+	"galaxy/server/internal/model/game"
 )
 
 func (c *Cache) FleetSend(ri, fi int, planetNumber uint) error {

server/internal/controller/fleet_send_test.go

@@ -6,7 +6,8 @@ import (
 
 	e "galaxy/error"
 
-	"github.com/iliadenisov/galaxy/server/internal/model/game"
+	"galaxy/server/internal/model/game"
+
 	"github.com/stretchr/testify/assert"
 )
 

server/internal/controller/fleet_test.go

@@ -7,8 +7,9 @@ import (
 
 	e "galaxy/error"
 
+	"galaxy/server/internal/model/game"
+
 	"github.com/google/uuid"
-	"github.com/iliadenisov/galaxy/server/internal/model/game"
 	"github.com/stretchr/testify/assert"
 )
 

server/internal/controller/generate_game.go

@@ -5,9 +5,10 @@ import (
 	"math/rand/v2"
 	"slices"
 
+	"galaxy/server/internal/generator"
+	"galaxy/server/internal/model/game"
+
 	"github.com/google/uuid"
-	"github.com/iliadenisov/galaxy/server/internal/generator"
-	"github.com/iliadenisov/galaxy/server/internal/model/game"
 )
 
 func NewGame(r Repo, races []string) (uuid.UUID, error) {

server/internal/controller/generate_game_test.go

@@ -8,10 +8,11 @@ import (
 
 	"galaxy/util"
 
+	"galaxy/server/internal/controller"
+	"galaxy/server/internal/model/game"
+	"galaxy/server/internal/repo"
+
 	"github.com/google/uuid"
-	"github.com/iliadenisov/galaxy/server/internal/controller"
-	"github.com/iliadenisov/galaxy/server/internal/model/game"
-	"github.com/iliadenisov/galaxy/server/internal/repo"
 	"github.com/stretchr/testify/assert"
 )
 

server/internal/controller/generate_turn.go

@@ -6,8 +6,9 @@ import (
 
 	"galaxy/model/report"
 
+	"galaxy/server/internal/model/game"
+
 	"github.com/google/uuid"
-	"github.com/iliadenisov/galaxy/server/internal/model/game"
 )
 
 func (c *Controller) MakeTurn() error {

server/internal/controller/order.go

@@ -8,8 +8,9 @@ import (
 
 	e "galaxy/error"
 
+	"galaxy/server/internal/model/game"
+
 	"github.com/google/uuid"
-	"github.com/iliadenisov/galaxy/server/internal/model/game"
 )
 
 func (c *Controller) ValidateOrder(actor string, commands ...order.DecodableCommand) (err error) {

server/internal/controller/planet.go

@@ -9,8 +9,9 @@ import (
 
 	e "galaxy/error"
 
+	"galaxy/server/internal/model/game"
+
 	"github.com/google/uuid"
-	"github.com/iliadenisov/galaxy/server/internal/model/game"
 )
 
 func (c *Cache) PlanetRename(ri int, number int, name string) error {

server/internal/controller/planet_test.go

@@ -8,9 +8,10 @@ import (
 
 	e "galaxy/error"
 
+	"galaxy/server/internal/controller"
+	"galaxy/server/internal/model/game"
+
 	"github.com/google/uuid"
-	"github.com/iliadenisov/galaxy/server/internal/controller"
-	"github.com/iliadenisov/galaxy/server/internal/model/game"
 	"github.com/stretchr/testify/assert"
 )
 

server/internal/controller/race.go

@@ -7,7 +7,7 @@ import (
 
 	e "galaxy/error"
 
-	"github.com/iliadenisov/galaxy/server/internal/model/game"
+	"galaxy/server/internal/model/game"
 )
 
 func (c *Cache) Relation(r1, r2 int) game.Relation {

server/internal/controller/race_test.go

@@ -5,7 +5,8 @@ import (
 
 	e "galaxy/error"
 
-	"github.com/iliadenisov/galaxy/server/internal/model/game"
+	"galaxy/server/internal/model/game"
+
 	"github.com/stretchr/testify/assert"
 )
 

server/internal/controller/report.go

@@ -10,8 +10,9 @@ import (
 
 	"galaxy/util"
 
+	"galaxy/server/internal/model/game"
+
 	"github.com/google/uuid"
-	"github.com/iliadenisov/galaxy/server/internal/model/game"
 )
 
 func (c *Cache) Report(t uint, battles []*mr.BattleReport, bombings []*mr.Bombing) iter.Seq[*mr.Report] {

server/internal/controller/route.go

@@ -12,7 +12,7 @@ import (
 
 	e "galaxy/error"
 
-	"github.com/iliadenisov/galaxy/server/internal/model/game"
+	"galaxy/server/internal/model/game"
 )
 
 func (c *Cache) PlanetRouteSet(ri int, rt game.RouteType, origin, destination uint) error {

server/internal/controller/route_test.go

@@ -6,8 +6,8 @@ import (
 
 	e "galaxy/error"
 
-	"github.com/iliadenisov/galaxy/server/internal/controller"
-	"github.com/iliadenisov/galaxy/server/internal/model/game"
+	"galaxy/server/internal/controller"
+	"galaxy/server/internal/model/game"
 
 	"github.com/stretchr/testify/assert"
 )

server/internal/controller/science.go

@@ -8,8 +8,9 @@ import (
 
 	e "galaxy/error"
 
+	"galaxy/server/internal/model/game"
+
 	"github.com/google/uuid"
-	"github.com/iliadenisov/galaxy/server/internal/model/game"
 )
 
 func (c *Cache) ScienceCreate(ri int, name string, drive, weapons, shileds, cargo float64) error {

server/internal/controller/science_test.go

@@ -5,9 +5,10 @@ import (
 
 	e "galaxy/error"
 
+	"galaxy/server/internal/controller"
+	"galaxy/server/internal/model/game"
+
 	"github.com/google/uuid"
-	"github.com/iliadenisov/galaxy/server/internal/controller"
-	"github.com/iliadenisov/galaxy/server/internal/model/game"
 	"github.com/stretchr/testify/assert"
 )
 

server/internal/controller/ship_class.go

@@ -9,8 +9,9 @@ import (
 
 	e "galaxy/error"
 
+	"galaxy/server/internal/model/game"
+
 	"github.com/google/uuid"
-	"github.com/iliadenisov/galaxy/server/internal/model/game"
 )
 
 func (c *Cache) ShipClassCreate(ri int, typeName string, drive float64, ammo int, weapons, shileds, cargo float64) error {

server/internal/controller/ship_group.go

@@ -11,8 +11,9 @@ import (
 
 	e "galaxy/error"
 
+	"galaxy/server/internal/model/game"
+
 	"github.com/google/uuid"
-	"github.com/iliadenisov/galaxy/server/internal/model/game"
 )
 
 // ShipGroup is a proxy func, nothing to cache

server/internal/controller/ship_group_move.go

@@ -6,7 +6,7 @@ import (
 
 	"galaxy/util"
 
-	"github.com/iliadenisov/galaxy/server/internal/model/game"
+	"galaxy/server/internal/model/game"
 )
 
 func (c *Cache) MoveShipGroups() {

server/internal/controller/ship_group_move_test.go

@@ -4,7 +4,8 @@ import (
 	"slices"
 	"testing"
 
-	"github.com/iliadenisov/galaxy/server/internal/model/game"
+	"galaxy/server/internal/model/game"
+
 	"github.com/stretchr/testify/assert"
 )
 

server/internal/controller/ship_group_send.go

@@ -5,8 +5,9 @@ import (
 
 	e "galaxy/error"
 
+	"galaxy/server/internal/model/game"
+
 	"github.com/google/uuid"
-	"github.com/iliadenisov/galaxy/server/internal/model/game"
 )
 
 func (c *Cache) shipGroupSend(ri int, groupID uuid.UUID, planetNumber uint) error {

server/internal/controller/ship_group_send_test.go

@@ -7,7 +7,8 @@ import (
 
 	"github.com/google/uuid"
 
-	"github.com/iliadenisov/galaxy/server/internal/model/game"
+	"galaxy/server/internal/model/game"
+
 	"github.com/stretchr/testify/assert"
 )
 

server/internal/controller/ship_group_test.go

@@ -10,8 +10,9 @@ import (
 
 	e "galaxy/error"
 
+	"galaxy/server/internal/model/game"
+
 	"github.com/google/uuid"
-	"github.com/iliadenisov/galaxy/server/internal/model/game"
 	"github.com/stretchr/testify/assert"
 )
 

server/internal/controller/ship_group_upgrade.go

@@ -7,8 +7,9 @@ import (
 
 	e "galaxy/error"
 
+	"galaxy/server/internal/model/game"
+
 	"github.com/google/uuid"
-	"github.com/iliadenisov/galaxy/server/internal/model/game"
 )
 
 func (c *Cache) shipGroupUpgrade(ri int, groupID uuid.UUID, techInput string, limitLevel float64) error {

server/internal/controller/ship_group_upgrade_test.go

@@ -5,10 +5,11 @@ import (
 
 	e "galaxy/error"
 
+	"galaxy/server/internal/controller"
+	"galaxy/server/internal/model/game"
+	g "galaxy/server/internal/model/game"
+
 	"github.com/google/uuid"
-	"github.com/iliadenisov/galaxy/server/internal/controller"
-	"github.com/iliadenisov/galaxy/server/internal/model/game"
-	g "github.com/iliadenisov/galaxy/server/internal/model/game"
 	"github.com/stretchr/testify/assert"
 )
 

server/internal/controller/vote.go

@@ -7,8 +7,9 @@ import (
 	"math/big"
 	"slices"
 
+	"galaxy/server/internal/model/game"
+
 	"github.com/google/uuid"
-	"github.com/iliadenisov/galaxy/server/internal/model/game"
 )
 
 type VoteGroup struct {

server/internal/controller/vote_test.go

@@ -3,9 +3,10 @@ package controller_test
 import (
 	"testing"
 
+	"galaxy/server/internal/controller"
+	"galaxy/server/internal/model/game"
+
 	"github.com/google/uuid"
-	"github.com/iliadenisov/galaxy/server/internal/controller"
-	"github.com/iliadenisov/galaxy/server/internal/model/game"
 	"github.com/stretchr/testify/assert"
 )