Skip to content

Commit

Permalink
chore: cleanup module (#1118)
Browse files Browse the repository at this point in the history
  • Loading branch information
@morremeyer
morremeyer authored Jan 3, 2025
1 parent 3d42f8d commit e2a52c2
Show file tree
Hide file tree
Showing 132 changed files with 388 additions and 329 deletions.
2 changes: 1 addition & 1 deletion .goreleaser.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ builds:
- amd64
- arm64
ldflags:
- -X github.com/envelope-zero/backend/v5/pkg/router.version={{.Version}}
- -X github.com/envelope-zero/backend/v5/internal/router.version={{.Version}}

snapshot:
name_template: "{{ incpatch .Version }}-next"
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ coverage: test
VERSION ?= $(shell git rev-parse HEAD)
.PHONY: build
build:
go build -ldflags "-X github.com/envelope-zero/backend/v5/pkg/router.version=${VERSION}"
go build -ldflags "-X github.com/envelope-zero/backend/v5/internal/router.version=${VERSION}"

.PHONY: docs
docs:
Expand Down
4 changes: 2 additions & 2 deletions pkg/controllers/healthz/healthz.go → internal/controllers/healthz/healthz.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package healthz
import (
"net/http"

"github.com/envelope-zero/backend/v5/pkg/httputil"
"github.com/envelope-zero/backend/v5/pkg/models"
"github.com/envelope-zero/backend/v5/internal/httputil"
"github.com/envelope-zero/backend/v5/internal/models"
"github.com/gin-gonic/gin"
)

Expand Down
4 changes: 2 additions & 2 deletions pkg/controllers/healthz/healthz_test.go → internal/controllers/healthz/healthz_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"net/http/httptest"
"testing"

"github.com/envelope-zero/backend/v5/pkg/controllers/healthz"
"github.com/envelope-zero/backend/v5/pkg/models"
"github.com/envelope-zero/backend/v5/internal/controllers/healthz"
"github.com/envelope-zero/backend/v5/internal/models"
"github.com/envelope-zero/backend/v5/test"
"github.com/gin-gonic/gin"
"github.com/stretchr/testify/assert"
Expand Down
4 changes: 2 additions & 2 deletions pkg/controllers/root/root.go → internal/controllers/root/root.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package root
import (
"net/http"

"github.com/envelope-zero/backend/v5/pkg/httputil"
"github.com/envelope-zero/backend/v5/pkg/models"
"github.com/envelope-zero/backend/v5/internal/httputil"
"github.com/envelope-zero/backend/v5/internal/models"
"github.com/gin-gonic/gin"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/controllers/root/root_test.go → internal/controllers/root/root_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"net/http/httptest"
"testing"

"github.com/envelope-zero/backend/v5/pkg/controllers/root"
"github.com/envelope-zero/backend/v5/internal/controllers/root"
"github.com/envelope-zero/backend/v5/test"
"github.com/gin-gonic/gin"
"github.com/stretchr/testify/assert"
Expand Down
4 changes: 2 additions & 2 deletions pkg/controllers/v4/account.go → internal/controllers/v4/account.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package v4
import (
"net/http"

"github.com/envelope-zero/backend/v5/internal/httputil"
"github.com/envelope-zero/backend/v5/internal/models"
"github.com/envelope-zero/backend/v5/internal/uuid"
"github.com/envelope-zero/backend/v5/pkg/httputil"
"github.com/envelope-zero/backend/v5/pkg/models"
"github.com/gin-gonic/gin"
"golang.org/x/exp/slices"
)
Expand Down
4 changes: 2 additions & 2 deletions pkg/controllers/v4/account_test.go → internal/controllers/v4/account_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"testing"
"time"

v4 "github.com/envelope-zero/backend/v5/pkg/controllers/v4"
"github.com/envelope-zero/backend/v5/pkg/models"
v4 "github.com/envelope-zero/backend/v5/internal/controllers/v4"
"github.com/envelope-zero/backend/v5/internal/models"
"github.com/envelope-zero/backend/v5/test"
"github.com/google/uuid"
"github.com/shopspring/decimal"
Expand Down
2 changes: 1 addition & 1 deletion pkg/controllers/v4/account_types.go → internal/controllers/v4/account_types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"fmt"
"time"

"github.com/envelope-zero/backend/v5/internal/models"
ez_uuid "github.com/envelope-zero/backend/v5/internal/uuid"
"github.com/envelope-zero/backend/v5/pkg/models"
"github.com/gin-gonic/gin"
"github.com/google/uuid"
"github.com/shopspring/decimal"
Expand Down
4 changes: 2 additions & 2 deletions pkg/controllers/v4/budget.go → internal/controllers/v4/budget.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package v4
import (
"net/http"

"github.com/envelope-zero/backend/v5/pkg/httputil"
"github.com/envelope-zero/backend/v5/pkg/models"
"github.com/envelope-zero/backend/v5/internal/httputil"
"github.com/envelope-zero/backend/v5/internal/models"
"github.com/gin-gonic/gin"
"golang.org/x/exp/slices"
)
Expand Down
4 changes: 2 additions & 2 deletions pkg/controllers/v4/budget_test.go → internal/controllers/v4/budget_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"net/http/httptest"
"testing"

v4 "github.com/envelope-zero/backend/v5/pkg/controllers/v4"
"github.com/envelope-zero/backend/v5/pkg/models"
v4 "github.com/envelope-zero/backend/v5/internal/controllers/v4"
"github.com/envelope-zero/backend/v5/internal/models"
"github.com/envelope-zero/backend/v5/test"
"github.com/google/uuid"
"github.com/stretchr/testify/assert"
Expand Down
2 changes: 1 addition & 1 deletion pkg/controllers/v4/budget_types.go → internal/controllers/v4/budget_types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package v4
import (
"fmt"

"github.com/envelope-zero/backend/v5/pkg/models"
"github.com/envelope-zero/backend/v5/internal/models"
"github.com/gin-gonic/gin"
)

Expand Down
4 changes: 2 additions & 2 deletions pkg/controllers/v4/category.go → internal/controllers/v4/category.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package v4
import (
"net/http"

"github.com/envelope-zero/backend/v5/pkg/httputil"
"github.com/envelope-zero/backend/v5/pkg/models"
"github.com/envelope-zero/backend/v5/internal/httputil"
"github.com/envelope-zero/backend/v5/internal/models"
"github.com/gin-gonic/gin"
"golang.org/x/exp/slices"
)
Expand Down
4 changes: 2 additions & 2 deletions pkg/controllers/v4/category_test.go → internal/controllers/v4/category_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"net/http/httptest"
"testing"

v4 "github.com/envelope-zero/backend/v5/pkg/controllers/v4"
"github.com/envelope-zero/backend/v5/pkg/models"
v4 "github.com/envelope-zero/backend/v5/internal/controllers/v4"
"github.com/envelope-zero/backend/v5/internal/models"
"github.com/envelope-zero/backend/v5/test"
"github.com/google/uuid"
"github.com/stretchr/testify/assert"
Expand Down
2 changes: 1 addition & 1 deletion pkg/controllers/v4/category_types.go → internal/controllers/v4/category_types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package v4
import (
"fmt"

"github.com/envelope-zero/backend/v5/internal/models"
ez_uuid "github.com/envelope-zero/backend/v5/internal/uuid"
"github.com/envelope-zero/backend/v5/pkg/models"
"github.com/gin-gonic/gin"
"github.com/google/uuid"
"gorm.io/gorm"
Expand Down
2 changes: 1 addition & 1 deletion pkg/controllers/v4/cleanup.go → internal/controllers/v4/cleanup.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package v4
import (
"net/http"

"github.com/envelope-zero/backend/v5/pkg/models"
"github.com/envelope-zero/backend/v5/internal/models"
"github.com/gin-gonic/gin"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/controllers/v4/cleanup_test.go → internal/controllers/v4/cleanup_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"testing"
"time"

v4 "github.com/envelope-zero/backend/v5/internal/controllers/v4"
"github.com/envelope-zero/backend/v5/internal/types"
v4 "github.com/envelope-zero/backend/v5/pkg/controllers/v4"
"github.com/envelope-zero/backend/v5/test"
"github.com/shopspring/decimal"
"github.com/stretchr/testify/assert"
Expand Down
4 changes: 2 additions & 2 deletions pkg/controllers/v4/envelope.go → internal/controllers/v4/envelope.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package v4
import (
"net/http"

"github.com/envelope-zero/backend/v5/internal/httputil"
"github.com/envelope-zero/backend/v5/internal/models"
ez_uuid "github.com/envelope-zero/backend/v5/internal/uuid"
"github.com/envelope-zero/backend/v5/pkg/httputil"
"github.com/envelope-zero/backend/v5/pkg/models"
"github.com/gin-gonic/gin"
"golang.org/x/exp/slices"
)
Expand Down
4 changes: 2 additions & 2 deletions pkg/controllers/v4/envelope_test.go → internal/controllers/v4/envelope_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"net/http/httptest"
"testing"

v4 "github.com/envelope-zero/backend/v5/pkg/controllers/v4"
"github.com/envelope-zero/backend/v5/pkg/models"
v4 "github.com/envelope-zero/backend/v5/internal/controllers/v4"
"github.com/envelope-zero/backend/v5/internal/models"
"github.com/envelope-zero/backend/v5/test"
"github.com/google/uuid"
"github.com/stretchr/testify/assert"
Expand Down
2 changes: 1 addition & 1 deletion pkg/controllers/v4/envelope_types.go → internal/controllers/v4/envelope_types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package v4
import (
"fmt"

"github.com/envelope-zero/backend/v5/internal/models"
ez_uuid "github.com/envelope-zero/backend/v5/internal/uuid"
"github.com/envelope-zero/backend/v5/pkg/models"
"github.com/gin-gonic/gin"
"github.com/google/uuid"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/controllers/v4/errors.go → internal/controllers/v4/errors.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"errors"
"net/http"

"github.com/envelope-zero/backend/v5/pkg/models"
"github.com/envelope-zero/backend/v5/internal/models"
)

type httpError struct {
Expand Down
4 changes: 2 additions & 2 deletions pkg/controllers/v4/export.go → internal/controllers/v4/export.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"reflect"
"time"

"github.com/envelope-zero/backend/v5/pkg/httputil"
"github.com/envelope-zero/backend/v5/pkg/models"
"github.com/envelope-zero/backend/v5/internal/httputil"
"github.com/envelope-zero/backend/v5/internal/models"
"github.com/gin-gonic/gin"
)

Expand Down
4 changes: 2 additions & 2 deletions pkg/controllers/v4/export_test.go → internal/controllers/v4/export_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"net/http"
"time"

v4 "github.com/envelope-zero/backend/v5/pkg/controllers/v4"
"github.com/envelope-zero/backend/v5/pkg/models"
v4 "github.com/envelope-zero/backend/v5/internal/controllers/v4"
"github.com/envelope-zero/backend/v5/internal/models"
"github.com/envelope-zero/backend/v5/test"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
Expand Down
0 pkg/controllers/v4/export_types.go → internal/controllers/v4/export_types.go
View file
File renamed without changes.
0 pkg/controllers/v4/filters.go → internal/controllers/v4/filters.go
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions pkg/controllers/v4/goal.go → internal/controllers/v4/goal.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ package v4
import (
"net/http"

"github.com/envelope-zero/backend/v5/internal/httputil"
"github.com/envelope-zero/backend/v5/internal/models"
"github.com/envelope-zero/backend/v5/internal/types"
ez_uuid "github.com/envelope-zero/backend/v5/internal/uuid"
"github.com/envelope-zero/backend/v5/pkg/httputil"
"github.com/envelope-zero/backend/v5/pkg/models"
"github.com/gin-gonic/gin"
"golang.org/x/exp/slices"
)
Expand Down
6 changes: 3 additions & 3 deletions pkg/controllers/v4/goal_test.go → internal/controllers/v4/goal_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import (
"net/http"
"testing"

v4 "github.com/envelope-zero/backend/v5/internal/controllers/v4"
"github.com/envelope-zero/backend/v5/internal/httputil"
"github.com/envelope-zero/backend/v5/internal/models"
"github.com/envelope-zero/backend/v5/internal/types"
v4 "github.com/envelope-zero/backend/v5/pkg/controllers/v4"
"github.com/envelope-zero/backend/v5/pkg/httputil"
"github.com/envelope-zero/backend/v5/pkg/models"
"github.com/envelope-zero/backend/v5/test"
"github.com/google/uuid"
"github.com/shopspring/decimal"
Expand Down
2 changes: 1 addition & 1 deletion pkg/controllers/v4/goal_types.go → internal/controllers/v4/goal_types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package v4
import (
"fmt"

"github.com/envelope-zero/backend/v5/internal/models"
"github.com/envelope-zero/backend/v5/internal/types"
ez_uuid "github.com/envelope-zero/backend/v5/internal/uuid"
"github.com/envelope-zero/backend/v5/pkg/models"
"github.com/gin-gonic/gin"
"github.com/google/uuid"
"github.com/shopspring/decimal"
Expand Down
10 changes: 5 additions & 5 deletions pkg/controllers/v4/import.go → internal/controllers/v4/import.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ import (
"net/http"
"strings"

"github.com/envelope-zero/backend/v5/internal/httputil"
"github.com/envelope-zero/backend/v5/internal/importer"
ynabimport "github.com/envelope-zero/backend/v5/internal/importer/parser/ynab-import"
"github.com/envelope-zero/backend/v5/internal/importer/parser/ynab4"
"github.com/envelope-zero/backend/v5/internal/models"
ez_uuid "github.com/envelope-zero/backend/v5/internal/uuid"
"github.com/envelope-zero/backend/v5/pkg/httputil"
"github.com/envelope-zero/backend/v5/pkg/importer"
ynabimport "github.com/envelope-zero/backend/v5/pkg/importer/parser/ynab-import"
"github.com/envelope-zero/backend/v5/pkg/importer/parser/ynab4"
"github.com/envelope-zero/backend/v5/pkg/models"
"github.com/gin-gonic/gin"
"github.com/google/uuid"
"github.com/ryanuber/go-glob"
Expand Down
4 changes: 2 additions & 2 deletions pkg/controllers/v4/import_test.go → internal/controllers/v4/import_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
"strings"
"testing"

v4 "github.com/envelope-zero/backend/v5/internal/controllers/v4"
"github.com/envelope-zero/backend/v5/internal/models"
"github.com/envelope-zero/backend/v5/internal/types"
v4 "github.com/envelope-zero/backend/v5/pkg/controllers/v4"
"github.com/envelope-zero/backend/v5/pkg/models"
"github.com/envelope-zero/backend/v5/test"
"github.com/google/uuid"
"github.com/shopspring/decimal"
Expand Down
2 changes: 1 addition & 1 deletion pkg/controllers/v4/import_types.go → internal/controllers/v4/import_types.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package v4

import (
"github.com/envelope-zero/backend/v5/pkg/importer"
"github.com/envelope-zero/backend/v5/internal/importer"
"github.com/gin-gonic/gin"
"github.com/google/uuid"
)
Expand Down
4 changes: 2 additions & 2 deletions pkg/controllers/v4/match_rule.go → internal/controllers/v4/match_rule.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (

"golang.org/x/exp/slices"

"github.com/envelope-zero/backend/v5/internal/httputil"
"github.com/envelope-zero/backend/v5/internal/models"
ez_uuid "github.com/envelope-zero/backend/v5/internal/uuid"
"github.com/envelope-zero/backend/v5/pkg/httputil"
"github.com/envelope-zero/backend/v5/pkg/models"
"github.com/gin-gonic/gin"
)

Expand Down
6 changes: 3 additions & 3 deletions pkg/controllers/v4/match_rule_test.go → internal/controllers/v4/match_rule_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"net/http"
"testing"

v4 "github.com/envelope-zero/backend/v5/pkg/controllers/v4"
"github.com/envelope-zero/backend/v5/pkg/httputil"
"github.com/envelope-zero/backend/v5/pkg/models"
v4 "github.com/envelope-zero/backend/v5/internal/controllers/v4"
"github.com/envelope-zero/backend/v5/internal/httputil"
"github.com/envelope-zero/backend/v5/internal/models"
"github.com/envelope-zero/backend/v5/test"
"github.com/google/uuid"
"github.com/stretchr/testify/assert"
Expand Down
2 changes: 1 addition & 1 deletion pkg/controllers/v4/match_rule_types.go → internal/controllers/v4/match_rule_types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package v4
import (
"fmt"

"github.com/envelope-zero/backend/v5/internal/models"
ez_uuid "github.com/envelope-zero/backend/v5/internal/uuid"
"github.com/envelope-zero/backend/v5/pkg/models"
"github.com/gin-gonic/gin"
"github.com/google/uuid"
)
Expand Down
4 changes: 2 additions & 2 deletions pkg/controllers/v4/month.go → internal/controllers/v4/month.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"fmt"
"net/http"

"github.com/envelope-zero/backend/v5/internal/httputil"
"github.com/envelope-zero/backend/v5/internal/models"
"github.com/envelope-zero/backend/v5/internal/types"
"github.com/envelope-zero/backend/v5/pkg/httputil"
"github.com/envelope-zero/backend/v5/pkg/models"
"github.com/gin-gonic/gin"
"github.com/google/uuid"
"github.com/shopspring/decimal"
Expand Down
4 changes: 2 additions & 2 deletions pkg/controllers/v4/month_config.go → internal/controllers/v4/month_config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"errors"
"net/http"

"github.com/envelope-zero/backend/v5/internal/httputil"
"github.com/envelope-zero/backend/v5/internal/models"
"github.com/envelope-zero/backend/v5/internal/types"
"github.com/envelope-zero/backend/v5/pkg/httputil"
"github.com/envelope-zero/backend/v5/pkg/models"
"github.com/gin-gonic/gin"
)

Expand Down
4 changes: 2 additions & 2 deletions pkg/controllers/v4/month_config_test.go → internal/controllers/v4/month_config_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
"testing"
"time"

v4 "github.com/envelope-zero/backend/v5/internal/controllers/v4"
"github.com/envelope-zero/backend/v5/internal/models"
"github.com/envelope-zero/backend/v5/internal/types"
v4 "github.com/envelope-zero/backend/v5/pkg/controllers/v4"
"github.com/envelope-zero/backend/v5/pkg/models"
"github.com/envelope-zero/backend/v5/test"
"github.com/google/uuid"
"github.com/stretchr/testify/assert"
Expand Down
2 changes: 1 addition & 1 deletion pkg/controllers/v4/month_config_types.go → ...rnal/controllers/v4/month_config_types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package v4
import (
"fmt"

"github.com/envelope-zero/backend/v5/internal/models"
"github.com/envelope-zero/backend/v5/internal/types"
"github.com/envelope-zero/backend/v5/pkg/models"
"github.com/gin-gonic/gin"
"github.com/google/uuid"
"github.com/shopspring/decimal"
Expand Down
Loading

0 comments on commit e2a52c2

Please sign in to comment.