update

Author: Degfy

.idea/vcs.xml

@@ -31,7 +31,6 @@ RUN sed 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' -i /etc/apk/repositories
 
 WORKDIR /app
 COPY config config
-COPY assert assert
 COPY --from=builder /app/bin/server /app/server
 
 ARG ENVIRONMENT=dev

Dockerfile

@@ -0,0 +1,13 @@
+build:
+	go install github.com/gone-io/gonectr@latest
+	go install go.uber.org/mock/mockgen@latest
+	gonectr build -ldflags="-w -s" -tags musl -o bin/server ./cmd/server
+
+run:
+	go install github.com/gone-io/gonectr@latest
+	go install go.uber.org/mock/mockgen@latest
+	gonectr run ./cmd/server
+
+
+build-docker:
+	docker compose build

Makefile

@@ -1,7 +1,7 @@
 services:
   api:
-    image: registry.cn-qingdao.aliyuncs.com/initium/panda-park:${ENVIRONMENT}
-    platform: linux/amd64
+    image: web-server
+#    platform: linux/amd64
     restart: on-failure
     build:
       context: .
@@ -14,15 +14,3 @@ services:
       timeout: 3s
       retries: 3
       start_period: 20s
-
-  proxy:
-    image: caddy
-    restart: unless-stopped
-    ports:
-      - "80:80"
-      - "443:443"
-    volumes:
-      - ./data/frontend/www:/usr/src/dist
-      - ./data/log:/data/log
-      - ./Caddyfile:/etc/caddy/Caddyfile
-      - ./ssl:/data/caddy/certificates

docker-compose.yaml

@@ -2,14 +2,19 @@ module web
 
 go 1.22.4
 
-require github.com/gone-io/gone v1.1.0-beta5
+require (
+	github.com/gone-io/gone v1.1.0-beta5
+	github.com/stretchr/testify v1.9.0
+	go.uber.org/mock v0.4.0
+)
 
 require (
 	github.com/andybalholm/brotli v1.1.0 // indirect
 	github.com/bytedance/sonic v1.10.2 // indirect
 	github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect
 	github.com/chenzhuoyu/iasm v0.9.1 // indirect
 	github.com/cloudflare/circl v1.4.0 // indirect
+	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/gabriel-vasile/mimetype v1.4.3 // indirect
 	github.com/gin-contrib/sse v0.1.0 // indirect
 	github.com/gin-gonic/gin v1.9.1 // indirect
@@ -38,6 +43,7 @@ require (
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/onsi/ginkgo/v2 v2.20.2 // indirect
 	github.com/pelletier/go-toml/v2 v2.2.2 // indirect
+	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/quic-go/qpack v0.5.1 // indirect
 	github.com/quic-go/quic-go v0.47.0 // indirect
 	github.com/refraction-networking/utls v1.6.7 // indirect
@@ -47,7 +53,6 @@ require (
 	github.com/syndtr/goleveldb v1.0.0 // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
 	github.com/ugorji/go/codec v1.2.12 // indirect
-	go.uber.org/mock v0.4.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.27.0 // indirect
 	golang.org/x/arch v0.7.0 // indirect

go.mod

@@ -16,6 +16,6 @@ type LoginResult struct {
 }
 
 type RegisterParam struct {
-	UserName string `json:"username"`
+	Username string `json:"username"`
 	Password string `json:"password"`
 }

internal/interface/entity/user.go

@@ -1 +1,5 @@
 package service
+
+type IDependent interface {
+	DoSomething() error
+}

internal/interface/service/i_depenendent.go

@@ -1 +1,11 @@
 package dependent
+
+import "github.com/gone-io/gone"
+
+type iDependent struct {
+	gone.Flag
+}
+
+func (s *iDependent) DoSomething() error {
+	return nil
+}

internal/module/dependent/dependent.go

@@ -2,15 +2,23 @@ package user
 
 import (
 	"web/internal/interface/entity"
+	"web/internal/interface/service"
 
 	"github.com/gone-io/gone"
 )
 
 type iUser struct {
 	gone.Flag
+
+	iDep service.IDependent `gone:"*"`
 }
 
 func (s *iUser) Register(registerParam *entity.RegisterParam) (*entity.LoginResult, error) {
+	err := s.iDep.DoSomething()
+	if err != nil {
+		return nil, gone.ToError(err)
+	}
+
 	return &entity.LoginResult{
 		Token: "token",
 		User: &entity.User{

internal/module/user/user.go

@@ -2,42 +2,36 @@ package user
 
 import (
 	"github.com/gone-io/gone"
-	"reflect"
+	"github.com/stretchr/testify/assert"
+	"go.uber.org/mock/gomock"
 	"testing"
-	"web/internal/interface/service"
+	"web/internal/interface/entity"
+	"web/internal/interface/mock"
 )
 
 func Test_iUser_Register(t *testing.T) {
-	type fields struct {
-		Flag gone.Flag
-		iDep service.IDependent
-	}
-	type args struct {
-		registerParam *entity.RegisterParam
-	}
-	tests := []struct {
-		name    string
-		fields  fields
-		args    args
-		want    *entity.LoginResult
-		wantErr bool
-	}{
-		// TODO: Add test cases.
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			s := &iUser{
-				Flag: tt.fields.Flag,
-				iDep: tt.fields.iDep,
-			}
-			got, err := s.Register(tt.args.registerParam)
-			if (err != nil) != tt.wantErr {
-				t.Errorf("Register() error = %v, wantErr %v", err, tt.wantErr)
-				return
-			}
-			if !reflect.DeepEqual(got, tt.want) {
-				t.Errorf("Register() got = %v, want %v", got, tt.want)
-			}
+	gone.RunTest(func(in struct {
+		iUser      *iUser               `gone:"*"` //inject iUser for test
+		iDependent *mock.MockIDependent `gone:"*"` //inject iDependent for mock
+	}) {
+		err := gone.ToError("err")
+		in.iDependent.EXPECT().DoSomething().Return(err)
+
+		register, err2 := in.iUser.Register(&entity.RegisterParam{
+			Username: "test",
+			Password: "test",
 		})
-	}
+		assert.Nil(t, register)
+		assert.Equal(t, err2, err)
+	}, func(cemetery gone.Cemetery) error {
+		controller := gomock.NewController(t)
+
+		//load all mocked components
+		mock.MockPriest(cemetery, controller)
+
+		//bury the tested component
+		cemetery.Bury(&iUser{})
+
+		return nil
+	})
 }