Move internal/dmrconst -> internal/dmr/dmrconst

USA-RedDragon · Feb 25, 2023 · dbb4a53 · dbb4a53
1 parent 8ec12b3
commit dbb4a53
Show file tree

Hide file tree

Showing 13 changed files with 11 additions and 11 deletions.
diff --git a/internal/db/models/packet.go b/internal/db/models/packet.go
@@ -22,7 +22,7 @@ package models
 import (
 	"fmt"
 
-	"github.com/USA-RedDragon/DMRHub/internal/dmrconst"
+	"github.com/USA-RedDragon/DMRHub/internal/dmr/dmrconst"
 )
 
 // Packet is a DMR packet

diff --git a/internal/db/models/packet_test.go b/internal/db/models/packet_test.go
@@ -23,7 +23,7 @@ import (
 	"testing"
 
 	"github.com/USA-RedDragon/DMRHub/internal/db/models"
-	"github.com/USA-RedDragon/DMRHub/internal/dmrconst"
+	"github.com/USA-RedDragon/DMRHub/internal/dmr/dmrconst"
 	"github.com/google/go-cmp/cmp"
 )
 

diff --git a/internal/db/models/talkgroup.go b/internal/db/models/talkgroup.go
@@ -23,7 +23,7 @@ package models
 import (
 	"time"
 
-	"github.com/USA-RedDragon/DMRHub/internal/dmrconst"
+	"github.com/USA-RedDragon/DMRHub/internal/dmr/dmrconst"
 	"github.com/USA-RedDragon/DMRHub/internal/logging"
 	gorm_seeder "github.com/kachit/gorm-seeder"
 	"gorm.io/gorm"

diff --git a/internal/db/models/user.go b/internal/db/models/user.go
@@ -24,7 +24,7 @@ import (
 	"time"
 
 	"github.com/USA-RedDragon/DMRHub/internal/config"
-	"github.com/USA-RedDragon/DMRHub/internal/dmrconst"
+	"github.com/USA-RedDragon/DMRHub/internal/dmr/dmrconst"
 	"github.com/USA-RedDragon/DMRHub/internal/http/api/utils"
 	gorm_seeder "github.com/kachit/gorm-seeder"
 	"gorm.io/gorm"

diff --git a/internal/dmr/calltracker/call_tracker.go b/internal/dmr/calltracker/call_tracker.go
@@ -26,7 +26,7 @@ import (
 
 	"github.com/USA-RedDragon/DMRHub/internal/config"
 	"github.com/USA-RedDragon/DMRHub/internal/db/models"
-	dmrconst "github.com/USA-RedDragon/DMRHub/internal/dmrconst"
+	dmrconst "github.com/USA-RedDragon/DMRHub/internal/dmr/dmrconst"
 	"github.com/USA-RedDragon/DMRHub/internal/http/api/apimodels"
 	"github.com/USA-RedDragon/DMRHub/internal/logging"
 	"github.com/mitchellh/hashstructure/v2"

diff --git a/internal/dmrconst/const.go → internal/dmr/dmrconst/const.go b/internal/dmrconst/const.go → internal/dmr/dmrconst/const.go
diff --git a/internal/dmrconst/const_test.go → internal/dmr/dmrconst/const_test.go b/internal/dmrconst/const_test.go → internal/dmr/dmrconst/const_test.go
diff --git a/internal/dmr/servers/hbrp/packet_handlers.go b/internal/dmr/servers/hbrp/packet_handlers.go
@@ -33,8 +33,8 @@ import (
 
 	"github.com/USA-RedDragon/DMRHub/internal/config"
 	"github.com/USA-RedDragon/DMRHub/internal/db/models"
+	"github.com/USA-RedDragon/DMRHub/internal/dmr/dmrconst"
 	"github.com/USA-RedDragon/DMRHub/internal/dmr/utils"
-	"github.com/USA-RedDragon/DMRHub/internal/dmrconst"
 	"github.com/USA-RedDragon/DMRHub/internal/logging"
 	"github.com/USA-RedDragon/DMRHub/internal/sdk"
 	"go.opentelemetry.io/otel"

diff --git a/internal/dmr/servers/hbrp/server.go b/internal/dmr/servers/hbrp/server.go
@@ -27,8 +27,8 @@ import (
 	"github.com/USA-RedDragon/DMRHub/internal/config"
 	"github.com/USA-RedDragon/DMRHub/internal/db/models"
 	"github.com/USA-RedDragon/DMRHub/internal/dmr/calltracker"
+	"github.com/USA-RedDragon/DMRHub/internal/dmr/dmrconst"
 	"github.com/USA-RedDragon/DMRHub/internal/dmr/parrot"
-	"github.com/USA-RedDragon/DMRHub/internal/dmrconst"
 	"github.com/USA-RedDragon/DMRHub/internal/logging"
 	"github.com/redis/go-redis/v9"
 	"go.opentelemetry.io/otel"

diff --git a/internal/dmr/utils/utils.go b/internal/dmr/utils/utils.go
@@ -22,7 +22,7 @@ package utils
 import (
 	"github.com/USA-RedDragon/DMRHub/internal/config"
 	"github.com/USA-RedDragon/DMRHub/internal/db/models"
-	"github.com/USA-RedDragon/DMRHub/internal/dmrconst"
+	"github.com/USA-RedDragon/DMRHub/internal/dmr/dmrconst"
 	"github.com/USA-RedDragon/DMRHub/internal/logging"
 )
 

diff --git a/internal/http/api/controllers/v1/users/users.go b/internal/http/api/controllers/v1/users/users.go
@@ -28,7 +28,7 @@ import (
 
 	"github.com/USA-RedDragon/DMRHub/internal/config"
 	"github.com/USA-RedDragon/DMRHub/internal/db/models"
-	"github.com/USA-RedDragon/DMRHub/internal/dmrconst"
+	"github.com/USA-RedDragon/DMRHub/internal/dmr/dmrconst"
 	"github.com/USA-RedDragon/DMRHub/internal/http/api/apimodels"
 	"github.com/USA-RedDragon/DMRHub/internal/http/api/utils"
 	"github.com/USA-RedDragon/DMRHub/internal/userdb"

diff --git a/internal/http/api/controllers/v1/users/users_test.go b/internal/http/api/controllers/v1/users/users_test.go
@@ -28,7 +28,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/USA-RedDragon/DMRHub/internal/dmrconst"
+	"github.com/USA-RedDragon/DMRHub/internal/dmr/dmrconst"
 	"github.com/USA-RedDragon/DMRHub/internal/http/api/apimodels"
 	"github.com/USA-RedDragon/DMRHub/internal/testutils"
 	"github.com/stretchr/testify/assert"

diff --git a/internal/http/api/middleware/auth.go b/internal/http/api/middleware/auth.go
@@ -25,7 +25,7 @@ import (
 
 	"github.com/USA-RedDragon/DMRHub/internal/config"
 	"github.com/USA-RedDragon/DMRHub/internal/db/models"
-	"github.com/USA-RedDragon/DMRHub/internal/dmrconst"
+	"github.com/USA-RedDragon/DMRHub/internal/dmr/dmrconst"
 	"github.com/gin-contrib/sessions"
 	"github.com/gin-gonic/gin"
 	"go.opentelemetry.io/otel/attribute"