git-sync/crawlab
1
0
Fork 0
mirror of https://github.com/crawlab-team/crawlab.git synced 2026-01-21 17:21:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Remove unused code and update dependencies

Browse Source
This commit is contained in:
Marvin Zhang
2024-07-13 11:08:56 +08:00
parent 54cf19f679
commit 9073f1ca02
8 changed files with 154 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/apps/utils.go
View File

@@ -31,10 +31,3 @@ func initModule(name string, fn func() error) (err error) {
log.Info(fmt.Sprintf("initialized %s successfully", name)) log.Info(fmt.Sprintf("initialized %s successfully", name))
return nil return nil
} }
func initApp(name string, app App) {
_ = initModule(name, func() error {
app.Init()
return nil
})
}

5
core/cmd/root.go
View File

@@ -23,11 +23,6 @@ func Execute() error {
return rootCmd.Execute() return rootCmd.Execute()
} }
// GetRootCmd get rootCmd instance
func GetRootCmd() *cobra.Command {
return rootCmd
}
func init() { func init() {
rootCmd.PersistentFlags().StringVar(&cfgFile, "c", "", "Use Custom Config File") rootCmd.PersistentFlags().StringVar(&cfgFile, "c", "", "Use Custom Config File")
} }

12
core/config/version.go
View File

@@ -1,12 +0,0 @@
package config
import "strings"
const Version = "v0.6.3"
func GetVersion() (v string) {
if strings.HasPrefix(Version, "v") {
return Version
}
return "v" + Version
}

115
core/fs/service_v2_test.go
View File

@@ -1,7 +1,7 @@
package fs package fs
import ( import (
"io/ioutil" "github.com/apex/log"
"os" "os"
"path/filepath" "path/filepath"
"testing" "testing"
@@ -10,20 +10,25 @@ import (
) )
func TestServiceV2_List(t *testing.T) { func TestServiceV2_List(t *testing.T) {
rootDir, err := ioutil.TempDir("", "fsTest") rootDir, err := os.MkdirTemp("", "fsTest")
if err != nil { if err != nil {
t.Fatalf("Failed to create temp dir: %v", err) t.Fatalf("Failed to create temp dir: %v", err)
} }
defer os.RemoveAll(rootDir) // clean up defer func() {
err := os.RemoveAll(rootDir) // clean up
if err != nil {
log.Errorf("Failed to remove temp dir: %v", err)
}
}()
testDir := filepath.Join(rootDir, "dir") testDir := filepath.Join(rootDir, "dir")
os.Mkdir(testDir, 0755) _ = os.Mkdir(testDir, 0755)
ioutil.WriteFile(filepath.Join(testDir, "file1.txt"), []byte("hello world"), 0644) _ = os.WriteFile(filepath.Join(testDir, "file1.txt"), []byte("hello world"), 0644)
ioutil.WriteFile(filepath.Join(testDir, "file2.txt"), []byte("hello again"), 0644) _ = os.WriteFile(filepath.Join(testDir, "file2.txt"), []byte("hello again"), 0644)
subDir := filepath.Join(testDir, "subdir") subDir := filepath.Join(testDir, "subdir")
os.Mkdir(subDir, 0755) _ = os.Mkdir(subDir, 0755)
ioutil.WriteFile(filepath.Join(subDir, "file3.txt"), []byte("subdir file"), 0644) _ = os.WriteFile(filepath.Join(subDir, "file3.txt"), []byte("subdir file"), 0644)
os.Mkdir(filepath.Join(testDir, "empty"), 0755) // explicitly testing empty dir inclusion _ = os.Mkdir(filepath.Join(testDir, "empty"), 0755) // explicitly testing empty dir inclusion
svc := NewFsServiceV2(rootDir) svc := NewFsServiceV2(rootDir)
@@ -56,14 +61,19 @@ func TestServiceV2_List(t *testing.T) {
} }
func TestServiceV2_GetFile(t *testing.T) { func TestServiceV2_GetFile(t *testing.T) {
rootDir, err := ioutil.TempDir("", "fsTest") rootDir, err := os.MkdirTemp("", "fsTest")
if err != nil { if err != nil {
t.Fatalf("Failed to create temp dir: %v", err) t.Fatalf("Failed to create temp dir: %v", err)
} }
defer os.RemoveAll(rootDir) // clean up defer func() {
err := os.RemoveAll(rootDir) // clean up
if err != nil {
log.Errorf("Failed to remove temp dir: %v", err)
}
}()
expectedContent := []byte("hello world") expectedContent := []byte("hello world")
ioutil.WriteFile(filepath.Join(rootDir, "file.txt"), expectedContent, 0644) _ = os.WriteFile(filepath.Join(rootDir, "file.txt"), expectedContent, 0644)
svc := NewFsServiceV2(rootDir) svc := NewFsServiceV2(rootDir)
@@ -75,14 +85,19 @@ func TestServiceV2_GetFile(t *testing.T) {
} }
func TestServiceV2_Delete(t *testing.T) { func TestServiceV2_Delete(t *testing.T) {
rootDir, err := ioutil.TempDir("", "fsTest") rootDir, err := os.MkdirTemp("", "fsTest")
if err != nil { if err != nil {
t.Fatalf("Failed to create temp dir: %v", err) t.Fatalf("Failed to create temp dir: %v", err)
} }
defer os.RemoveAll(rootDir) // clean up defer func() {
err := os.RemoveAll(rootDir) // clean up
if err != nil {
log.Errorf("Failed to remove temp dir: %v", err)
}
}()
filePath := filepath.Join(rootDir, "file.txt") filePath := filepath.Join(rootDir, "file.txt")
ioutil.WriteFile(filePath, []byte("hello world"), 0644) _ = os.WriteFile(filePath, []byte("hello world"), 0644)
svc := NewFsServiceV2(rootDir) svc := NewFsServiceV2(rootDir)
@@ -98,11 +113,16 @@ func TestServiceV2_Delete(t *testing.T) {
} }
func TestServiceV2_CreateDir(t *testing.T) { func TestServiceV2_CreateDir(t *testing.T) {
rootDir, err := ioutil.TempDir("", "fsTest") rootDir, err := os.MkdirTemp("", "fsTest")
if err != nil { if err != nil {
t.Fatalf("Failed to create temp dir: %v", err) t.Fatalf("Failed to create temp dir: %v", err)
} }
defer os.RemoveAll(rootDir) // clean up defer func() {
err := os.RemoveAll(rootDir) // clean up
if err != nil {
log.Errorf("Failed to remove temp dir: %v", err)
}
}()
svc := NewFsServiceV2(rootDir) svc := NewFsServiceV2(rootDir)
@@ -118,11 +138,16 @@ func TestServiceV2_CreateDir(t *testing.T) {
} }
func TestServiceV2_Save(t *testing.T) { func TestServiceV2_Save(t *testing.T) {
rootDir, err := ioutil.TempDir("", "fsTest") rootDir, err := os.MkdirTemp("", "fsTest")
if err != nil { if err != nil {
t.Fatalf("Failed to create temp dir: %v", err) t.Fatalf("Failed to create temp dir: %v", err)
} }
defer os.RemoveAll(rootDir) // clean up defer func() {
err := os.RemoveAll(rootDir) // clean up
if err != nil {
log.Errorf("Failed to remove temp dir: %v", err)
}
}()
svc := NewFsServiceV2(rootDir) svc := NewFsServiceV2(rootDir)
@@ -133,22 +158,27 @@ func TestServiceV2_Save(t *testing.T) {
} }
// Verify the file was saved // Verify the file was saved
data, err := ioutil.ReadFile(filepath.Join(rootDir, "newFile.txt")) data, err := os.ReadFile(filepath.Join(rootDir, "newFile.txt"))
assert.NoError(t, err) assert.NoError(t, err)
assert.Equal(t, "Hello, world!", string(data)) assert.Equal(t, "Hello, world!", string(data))
} }
func TestServiceV2_Rename(t *testing.T) { func TestServiceV2_Rename(t *testing.T) {
rootDir, err := ioutil.TempDir("", "fsTest") rootDir, err := os.MkdirTemp("", "fsTest")
if err != nil { if err != nil {
t.Fatalf("Failed to create temp dir: %v", err) t.Fatalf("Failed to create temp dir: %v", err)
} }
defer os.RemoveAll(rootDir) // clean up defer func() {
err := os.RemoveAll(rootDir) // clean up
if err != nil {
log.Errorf("Failed to remove temp dir: %v", err)
}
}()
svc := NewFsServiceV2(rootDir) svc := NewFsServiceV2(rootDir)
// Create a file to rename // Create a file to rename
ioutil.WriteFile(filepath.Join(rootDir, "oldName.txt"), []byte("Hello, world!"), 0644) _ = os.WriteFile(filepath.Join(rootDir, "oldName.txt"), []byte("Hello, world!"), 0644)
// Rename the file // Rename the file
err = svc.Rename("oldName.txt", "newName.txt") err = svc.Rename("oldName.txt", "newName.txt")
@@ -162,16 +192,21 @@ func TestServiceV2_Rename(t *testing.T) {
} }
func TestServiceV2_RenameDir(t *testing.T) { func TestServiceV2_RenameDir(t *testing.T) {
rootDir, err := ioutil.TempDir("", "fsTest") rootDir, err := os.MkdirTemp("", "fsTest")
if err != nil { if err != nil {
t.Fatalf("Failed to create temp dir: %v", err) t.Fatalf("Failed to create temp dir: %v", err)
} }
defer os.RemoveAll(rootDir) // clean up defer func() {
err := os.RemoveAll(rootDir) // clean up
if err != nil {
log.Errorf("Failed to remove temp dir: %v", err)
}
}()
svc := NewFsServiceV2(rootDir) svc := NewFsServiceV2(rootDir)
// Create a directory to rename // Create a directory to rename
os.Mkdir(filepath.Join(rootDir, "oldName"), 0755) _ = os.Mkdir(filepath.Join(rootDir, "oldName"), 0755)
// Rename the directory // Rename the directory
err = svc.Rename("oldName", "newName") err = svc.Rename("oldName", "newName")
@@ -185,16 +220,21 @@ func TestServiceV2_RenameDir(t *testing.T) {
} }
func TestServiceV2_Copy(t *testing.T) { func TestServiceV2_Copy(t *testing.T) {
rootDir, err := ioutil.TempDir("", "fsTest") rootDir, err := os.MkdirTemp("", "fsTest")
if err != nil { if err != nil {
t.Fatalf("Failed to create temp dir: %v", err) t.Fatalf("Failed to create temp dir: %v", err)
} }
defer os.RemoveAll(rootDir) // clean up defer func() {
err := os.RemoveAll(rootDir) // clean up
if err != nil {
log.Errorf("Failed to remove temp dir: %v", err)
}
}()
svc := NewFsServiceV2(rootDir) svc := NewFsServiceV2(rootDir)
// Create a file to copy // Create a file to copy
ioutil.WriteFile(filepath.Join(rootDir, "source.txt"), []byte("Hello, world!"), 0644) _ = os.WriteFile(filepath.Join(rootDir, "source.txt"), []byte("Hello, world!"), 0644)
// Copy the file // Copy the file
err = svc.Copy("source.txt", "copy.txt") err = svc.Copy("source.txt", "copy.txt")
@@ -203,23 +243,28 @@ func TestServiceV2_Copy(t *testing.T) {
} }
// Verify the file was copied // Verify the file was copied
data, err := ioutil.ReadFile(filepath.Join(rootDir, "copy.txt")) data, err := os.ReadFile(filepath.Join(rootDir, "copy.txt"))
assert.NoError(t, err) assert.NoError(t, err)
assert.Equal(t, "Hello, world!", string(data)) assert.Equal(t, "Hello, world!", string(data))
} }
func TestServiceV2_CopyDir(t *testing.T) { func TestServiceV2_CopyDir(t *testing.T) {
rootDir, err := ioutil.TempDir("", "fsTest") rootDir, err := os.MkdirTemp("", "fsTest")
if err != nil { if err != nil {
t.Fatalf("Failed to create temp dir: %v", err) t.Fatalf("Failed to create temp dir: %v", err)
} }
defer os.RemoveAll(rootDir) // clean up defer func() {
err := os.RemoveAll(rootDir) // clean up
if err != nil {
log.Errorf("Failed to remove temp dir: %v", err)
}
}()
svc := NewFsServiceV2(rootDir) svc := NewFsServiceV2(rootDir)
// Create a directory to copy // Create a directory to copy
os.Mkdir(filepath.Join(rootDir, "sourceDir"), 0755) _ = os.Mkdir(filepath.Join(rootDir, "sourceDir"), 0755)
ioutil.WriteFile(filepath.Join(rootDir, "sourceDir", "file.txt"), []byte("Hello, world!"), 0644) _ = os.WriteFile(filepath.Join(rootDir, "sourceDir", "file.txt"), []byte("Hello, world!"), 0644)
// Copy the directory // Copy the directory
err = svc.Copy("sourceDir", "copyDir") err = svc.Copy("sourceDir", "copyDir")
@@ -232,7 +277,7 @@ func TestServiceV2_CopyDir(t *testing.T) {
assert.NoError(t, err) assert.NoError(t, err)
// Verify the file inside the directory was copied // Verify the file inside the directory was copied
data, err := ioutil.ReadFile(filepath.Join(rootDir, "copyDir", "file.txt")) data, err := os.ReadFile(filepath.Join(rootDir, "copyDir", "file.txt"))
assert.NoError(t, err) assert.NoError(t, err)
assert.Equal(t, "Hello, world!", string(data)) assert.Equal(t, "Hello, world!", string(data))
} }

28
core/grpc/server/model_base_service_v2_server.go
View File

@@ -63,7 +63,7 @@ type ModelBaseServiceServerV2 struct {
grpc.UnimplementedModelBaseServiceV2Server grpc.UnimplementedModelBaseServiceV2Server
} }
func (svr ModelBaseServiceServerV2) GetById(ctx context.Context, req *grpc.ModelServiceV2GetByIdRequest) (res *grpc.Response, err error) { func (svr ModelBaseServiceServerV2) GetById(_ context.Context, req *grpc.ModelServiceV2GetByIdRequest) (res *grpc.Response, err error) {
id, err := primitive.ObjectIDFromHex(req.Id) id, err := primitive.ObjectIDFromHex(req.Id)
if err != nil { if err != nil {
return HandleError(err) return HandleError(err)
@@ -76,7 +76,7 @@ func (svr ModelBaseServiceServerV2) GetById(ctx context.Context, req *grpc.Model
return HandleSuccessWithData(data) return HandleSuccessWithData(data)
} }
func (svr ModelBaseServiceServerV2) GetOne(ctx context.Context, req *grpc.ModelServiceV2GetOneRequest) (res *grpc.Response, err error) { func (svr ModelBaseServiceServerV2) GetOne(_ context.Context, req *grpc.ModelServiceV2GetOneRequest) (res *grpc.Response, err error) {
var query bson.M var query bson.M
err = json.Unmarshal(req.Query, &query) err = json.Unmarshal(req.Query, &query)
if err != nil { if err != nil {
@@ -95,7 +95,7 @@ func (svr ModelBaseServiceServerV2) GetOne(ctx context.Context, req *grpc.ModelS
return HandleSuccessWithData(data) return HandleSuccessWithData(data)
} }
func (svr ModelBaseServiceServerV2) GetMany(ctx context.Context, req *grpc.ModelServiceV2GetManyRequest) (res *grpc.Response, err error) { func (svr ModelBaseServiceServerV2) GetMany(_ context.Context, req *grpc.ModelServiceV2GetManyRequest) (res *grpc.Response, err error) {
var query bson.M var query bson.M
err = json.Unmarshal(req.Query, &query) err = json.Unmarshal(req.Query, &query)
if err != nil { if err != nil {
@@ -114,7 +114,7 @@ func (svr ModelBaseServiceServerV2) GetMany(ctx context.Context, req *grpc.Model
return HandleSuccessWithData(data) return HandleSuccessWithData(data)
} }
func (svr ModelBaseServiceServerV2) DeleteById(ctx context.Context, req *grpc.ModelServiceV2DeleteByIdRequest) (res *grpc.Response, err error) { func (svr ModelBaseServiceServerV2) DeleteById(_ context.Context, req *grpc.ModelServiceV2DeleteByIdRequest) (res *grpc.Response, err error) {
id, err := primitive.ObjectIDFromHex(req.Id) id, err := primitive.ObjectIDFromHex(req.Id)
if err != nil { if err != nil {
return HandleError(err) return HandleError(err)
@@ -127,7 +127,7 @@ func (svr ModelBaseServiceServerV2) DeleteById(ctx context.Context, req *grpc.Mo
return HandleSuccess() return HandleSuccess()
} }
func (svr ModelBaseServiceServerV2) DeleteOne(ctx context.Context, req *grpc.ModelServiceV2DeleteOneRequest) (res *grpc.Response, err error) { func (svr ModelBaseServiceServerV2) DeleteOne(_ context.Context, req *grpc.ModelServiceV2DeleteOneRequest) (res *grpc.Response, err error) {
var query bson.M var query bson.M
err = json.Unmarshal(req.Query, &query) err = json.Unmarshal(req.Query, &query)
if err != nil { if err != nil {
@@ -141,7 +141,7 @@ func (svr ModelBaseServiceServerV2) DeleteOne(ctx context.Context, req *grpc.Mod
return HandleSuccess() return HandleSuccess()
} }
func (svr ModelBaseServiceServerV2) DeleteMany(ctx context.Context, req *grpc.ModelServiceV2DeleteManyRequest) (res *grpc.Response, err error) { func (svr ModelBaseServiceServerV2) DeleteMany(_ context.Context, req *grpc.ModelServiceV2DeleteManyRequest) (res *grpc.Response, err error) {
var query bson.M var query bson.M
err = json.Unmarshal(req.Query, &query) err = json.Unmarshal(req.Query, &query)
if err != nil { if err != nil {
@@ -155,7 +155,7 @@ func (svr ModelBaseServiceServerV2) DeleteMany(ctx context.Context, req *grpc.Mo
return HandleSuccess() return HandleSuccess()
} }
func (svr ModelBaseServiceServerV2) UpdateById(ctx context.Context, req *grpc.ModelServiceV2UpdateByIdRequest) (res *grpc.Response, err error) { func (svr ModelBaseServiceServerV2) UpdateById(_ context.Context, req *grpc.ModelServiceV2UpdateByIdRequest) (res *grpc.Response, err error) {
id, err := primitive.ObjectIDFromHex(req.Id) id, err := primitive.ObjectIDFromHex(req.Id)
if err != nil { if err != nil {
return HandleError(err) return HandleError(err)
@@ -173,7 +173,7 @@ func (svr ModelBaseServiceServerV2) UpdateById(ctx context.Context, req *grpc.Mo
return HandleSuccess() return HandleSuccess()
} }
func (svr ModelBaseServiceServerV2) UpdateOne(ctx context.Context, req *grpc.ModelServiceV2UpdateOneRequest) (res *grpc.Response, err error) { func (svr ModelBaseServiceServerV2) UpdateOne(_ context.Context, req *grpc.ModelServiceV2UpdateOneRequest) (res *grpc.Response, err error) {
var query bson.M var query bson.M
err = json.Unmarshal(req.Query, &query) err = json.Unmarshal(req.Query, &query)
if err != nil { if err != nil {
@@ -192,7 +192,7 @@ func (svr ModelBaseServiceServerV2) UpdateOne(ctx context.Context, req *grpc.Mod
return HandleSuccess() return HandleSuccess()
} }
func (svr ModelBaseServiceServerV2) UpdateMany(ctx context.Context, req *grpc.ModelServiceV2UpdateManyRequest) (res *grpc.Response, err error) { func (svr ModelBaseServiceServerV2) UpdateMany(_ context.Context, req *grpc.ModelServiceV2UpdateManyRequest) (res *grpc.Response, err error) {
var query bson.M var query bson.M
err = json.Unmarshal(req.Query, &query) err = json.Unmarshal(req.Query, &query)
if err != nil { if err != nil {
@@ -211,7 +211,7 @@ func (svr ModelBaseServiceServerV2) UpdateMany(ctx context.Context, req *grpc.Mo
return HandleSuccess() return HandleSuccess()
} }
func (svr ModelBaseServiceServerV2) ReplaceById(ctx context.Context, req *grpc.ModelServiceV2ReplaceByIdRequest) (res *grpc.Response, err error) { func (svr ModelBaseServiceServerV2) ReplaceById(_ context.Context, req *grpc.ModelServiceV2ReplaceByIdRequest) (res *grpc.Response, err error) {
id, err := primitive.ObjectIDFromHex(req.Id) id, err := primitive.ObjectIDFromHex(req.Id)
if err != nil { if err != nil {
return HandleError(err) return HandleError(err)
@@ -231,7 +231,7 @@ func (svr ModelBaseServiceServerV2) ReplaceById(ctx context.Context, req *grpc.M
return HandleSuccess() return HandleSuccess()
} }
func (svr ModelBaseServiceServerV2) ReplaceOne(ctx context.Context, req *grpc.ModelServiceV2ReplaceOneRequest) (res *grpc.Response, err error) { func (svr ModelBaseServiceServerV2) ReplaceOne(_ context.Context, req *grpc.ModelServiceV2ReplaceOneRequest) (res *grpc.Response, err error) {
var query bson.M var query bson.M
err = json.Unmarshal(req.Query, &query) err = json.Unmarshal(req.Query, &query)
if err != nil { if err != nil {
@@ -252,7 +252,7 @@ func (svr ModelBaseServiceServerV2) ReplaceOne(ctx context.Context, req *grpc.Mo
return HandleSuccess() return HandleSuccess()
} }
func (svr ModelBaseServiceServerV2) InsertOne(ctx context.Context, req *grpc.ModelServiceV2InsertOneRequest) (res *grpc.Response, err error) { func (svr ModelBaseServiceServerV2) InsertOne(_ context.Context, req *grpc.ModelServiceV2InsertOneRequest) (res *grpc.Response, err error) {
model := GetOneInstanceModel(req.ModelType) model := GetOneInstanceModel(req.ModelType)
modelType := reflect.TypeOf(model) modelType := reflect.TypeOf(model)
modelValuePtr := reflect.New(modelType).Interface() modelValuePtr := reflect.New(modelType).Interface()
@@ -268,7 +268,7 @@ func (svr ModelBaseServiceServerV2) InsertOne(ctx context.Context, req *grpc.Mod
return HandleSuccessWithData(r.InsertedID) return HandleSuccessWithData(r.InsertedID)
} }
func (svr ModelBaseServiceServerV2) InsertMany(ctx context.Context, req *grpc.ModelServiceV2InsertManyRequest) (res *grpc.Response, err error) { func (svr ModelBaseServiceServerV2) InsertMany(_ context.Context, req *grpc.ModelServiceV2InsertManyRequest) (res *grpc.Response, err error) {
model := GetOneInstanceModel(req.ModelType) model := GetOneInstanceModel(req.ModelType)
modelType := reflect.TypeOf(model) modelType := reflect.TypeOf(model)
modelsSliceType := reflect.SliceOf(modelType) modelsSliceType := reflect.SliceOf(modelType)
@@ -290,7 +290,7 @@ func (svr ModelBaseServiceServerV2) InsertMany(ctx context.Context, req *grpc.Mo
return HandleSuccessWithData(r.InsertedIDs) return HandleSuccessWithData(r.InsertedIDs)
} }
func (svr ModelBaseServiceServerV2) Count(ctx context.Context, req *grpc.ModelServiceV2CountRequest) (res *grpc.Response, err error) { func (svr ModelBaseServiceServerV2) Count(_ context.Context, req *grpc.ModelServiceV2CountRequest) (res *grpc.Response, err error) {
var query bson.M var query bson.M
err = json.Unmarshal(req.Query, &query) err = json.Unmarshal(req.Query, &query)
if err != nil { if err != nil {

105
core/models/client/model_service_v2_test.go
View File

@@ -2,6 +2,7 @@ package client_test
import ( import (
"context" "context"
"github.com/apex/log"
"github.com/crawlab-team/crawlab/core/grpc/server" "github.com/crawlab-team/crawlab/core/grpc/server"
"github.com/crawlab-team/crawlab/core/models/client" "github.com/crawlab-team/crawlab/core/models/client"
"github.com/crawlab-team/crawlab/core/models/models/v2" "github.com/crawlab-team/crawlab/core/models/models/v2"
@@ -28,13 +29,27 @@ func teardownTestDB() {
db.Drop(context.Background()) db.Drop(context.Background())
} }
func startSvr(svr *server.GrpcServerV2) {
err := svr.Start()
if err != nil {
log.Errorf("failed to start grpc server: %v", err)
}
}
func stopSvr(svr *server.GrpcServerV2) {
err := svr.Stop()
if err != nil {
log.Errorf("failed to stop grpc server: %v", err)
}
}
func TestModelServiceV2_GetById(t *testing.T) { func TestModelServiceV2_GetById(t *testing.T) {
setupTestDB() setupTestDB()
defer teardownTestDB() defer teardownTestDB()
svr, err := server.NewGrpcServerV2() svr, err := server.NewGrpcServerV2()
require.Nil(t, err) require.Nil(t, err)
go svr.Start() go startSvr(svr)
defer svr.Stop() defer stopSvr(svr)
m := TestModel{ m := TestModel{
Name: "Test Name", Name: "Test Name",
@@ -45,7 +60,7 @@ func TestModelServiceV2_GetById(t *testing.T) {
m.SetId(id) m.SetId(id)
time.Sleep(100 * time.Millisecond) time.Sleep(100 * time.Millisecond)
c, err := grpc.Dial("localhost:9666", grpc.WithTransportCredentials(insecure.NewCredentials())) c, err := grpc.NewClient("localhost:9666", grpc.WithTransportCredentials(insecure.NewCredentials()))
require.Nil(t, err) require.Nil(t, err)
c.Connect() c.Connect()
@@ -61,8 +76,8 @@ func TestModelServiceV2_GetOne(t *testing.T) {
defer teardownTestDB() defer teardownTestDB()
svr, err := server.NewGrpcServerV2() svr, err := server.NewGrpcServerV2()
require.Nil(t, err) require.Nil(t, err)
go svr.Start() go startSvr(svr)
defer svr.Stop() defer stopSvr(svr)
m := TestModel{ m := TestModel{
Name: "Test Name", Name: "Test Name",
@@ -73,7 +88,7 @@ func TestModelServiceV2_GetOne(t *testing.T) {
m.SetId(id) m.SetId(id)
time.Sleep(100 * time.Millisecond) time.Sleep(100 * time.Millisecond)
c, err := grpc.Dial("localhost:9666", grpc.WithTransportCredentials(insecure.NewCredentials())) c, err := grpc.NewClient("localhost:9666", grpc.WithTransportCredentials(insecure.NewCredentials()))
require.Nil(t, err) require.Nil(t, err)
c.Connect() c.Connect()
@@ -89,8 +104,8 @@ func TestModelServiceV2_GetMany(t *testing.T) {
defer teardownTestDB() defer teardownTestDB()
svr, err := server.NewGrpcServerV2() svr, err := server.NewGrpcServerV2()
require.Nil(t, err) require.Nil(t, err)
go svr.Start() go startSvr(svr)
defer svr.Stop() defer stopSvr(svr)
m := TestModel{ m := TestModel{
Name: "Test Name", Name: "Test Name",
@@ -101,7 +116,7 @@ func TestModelServiceV2_GetMany(t *testing.T) {
m.SetId(id) m.SetId(id)
time.Sleep(100 * time.Millisecond) time.Sleep(100 * time.Millisecond)
c, err := grpc.Dial("localhost:9666", grpc.WithTransportCredentials(insecure.NewCredentials())) c, err := grpc.NewClient("localhost:9666", grpc.WithTransportCredentials(insecure.NewCredentials()))
require.Nil(t, err) require.Nil(t, err)
c.Connect() c.Connect()
@@ -118,8 +133,8 @@ func TestModelServiceV2_DeleteById(t *testing.T) {
defer teardownTestDB() defer teardownTestDB()
svr, err := server.NewGrpcServerV2() svr, err := server.NewGrpcServerV2()
require.Nil(t, err) require.Nil(t, err)
go svr.Start() go startSvr(svr)
defer svr.Stop() defer stopSvr(svr)
m := TestModel{ m := TestModel{
Name: "Test Name", Name: "Test Name",
@@ -130,7 +145,7 @@ func TestModelServiceV2_DeleteById(t *testing.T) {
m.SetId(id) m.SetId(id)
time.Sleep(100 * time.Millisecond) time.Sleep(100 * time.Millisecond)
c, err := grpc.Dial("localhost:9666", grpc.WithTransportCredentials(insecure.NewCredentials())) c, err := grpc.NewClient("localhost:9666", grpc.WithTransportCredentials(insecure.NewCredentials()))
require.Nil(t, err) require.Nil(t, err)
c.Connect() c.Connect()
@@ -148,8 +163,8 @@ func TestModelServiceV2_DeleteOne(t *testing.T) {
defer teardownTestDB() defer teardownTestDB()
svr, err := server.NewGrpcServerV2() svr, err := server.NewGrpcServerV2()
require.Nil(t, err) require.Nil(t, err)
go svr.Start() go startSvr(svr)
defer svr.Stop() defer stopSvr(svr)
m := TestModel{ m := TestModel{
Name: "Test Name", Name: "Test Name",
@@ -160,7 +175,7 @@ func TestModelServiceV2_DeleteOne(t *testing.T) {
m.SetId(id) m.SetId(id)
time.Sleep(100 * time.Millisecond) time.Sleep(100 * time.Millisecond)
c, err := grpc.Dial("localhost:9666", grpc.WithTransportCredentials(insecure.NewCredentials())) c, err := grpc.NewClient("localhost:9666", grpc.WithTransportCredentials(insecure.NewCredentials()))
require.Nil(t, err) require.Nil(t, err)
c.Connect() c.Connect()
@@ -178,8 +193,8 @@ func TestModelServiceV2_DeleteMany(t *testing.T) {
defer teardownTestDB() defer teardownTestDB()
svr, err := server.NewGrpcServerV2() svr, err := server.NewGrpcServerV2()
require.Nil(t, err) require.Nil(t, err)
go svr.Start() go startSvr(svr)
defer svr.Stop() defer stopSvr(svr)
m := TestModel{ m := TestModel{
Name: "Test Name", Name: "Test Name",
@@ -190,7 +205,7 @@ func TestModelServiceV2_DeleteMany(t *testing.T) {
m.SetId(id) m.SetId(id)
time.Sleep(100 * time.Millisecond) time.Sleep(100 * time.Millisecond)
c, err := grpc.Dial("localhost:9666", grpc.WithTransportCredentials(insecure.NewCredentials())) c, err := grpc.NewClient("localhost:9666", grpc.WithTransportCredentials(insecure.NewCredentials()))
require.Nil(t, err) require.Nil(t, err)
c.Connect() c.Connect()
@@ -208,8 +223,8 @@ func TestModelServiceV2_UpdateById(t *testing.T) {
defer teardownTestDB() defer teardownTestDB()
svr, err := server.NewGrpcServerV2() svr, err := server.NewGrpcServerV2()
require.Nil(t, err) require.Nil(t, err)
go svr.Start() go startSvr(svr)
defer svr.Stop() defer stopSvr(svr)
m := TestModel{ m := TestModel{
Name: "Test Name", Name: "Test Name",
@@ -220,7 +235,7 @@ func TestModelServiceV2_UpdateById(t *testing.T) {
m.SetId(id) m.SetId(id)
time.Sleep(100 * time.Millisecond) time.Sleep(100 * time.Millisecond)
c, err := grpc.Dial("localhost:9666", grpc.WithTransportCredentials(insecure.NewCredentials())) c, err := grpc.NewClient("localhost:9666", grpc.WithTransportCredentials(insecure.NewCredentials()))
require.Nil(t, err) require.Nil(t, err)
c.Connect() c.Connect()
@@ -238,8 +253,8 @@ func TestModelServiceV2_UpdateOne(t *testing.T) {
defer teardownTestDB() defer teardownTestDB()
svr, err := server.NewGrpcServerV2() svr, err := server.NewGrpcServerV2()
require.Nil(t, err) require.Nil(t, err)
go svr.Start() go startSvr(svr)
defer svr.Stop() defer stopSvr(svr)
m := TestModel{ m := TestModel{
Name: "Test Name", Name: "Test Name",
@@ -250,7 +265,7 @@ func TestModelServiceV2_UpdateOne(t *testing.T) {
m.SetId(id) m.SetId(id)
time.Sleep(100 * time.Millisecond) time.Sleep(100 * time.Millisecond)
c, err := grpc.Dial("localhost:9666", grpc.WithTransportCredentials(insecure.NewCredentials())) c, err := grpc.NewClient("localhost:9666", grpc.WithTransportCredentials(insecure.NewCredentials()))
require.Nil(t, err) require.Nil(t, err)
c.Connect() c.Connect()
@@ -268,8 +283,8 @@ func TestModelServiceV2_UpdateMany(t *testing.T) {
defer teardownTestDB() defer teardownTestDB()
svr, err := server.NewGrpcServerV2() svr, err := server.NewGrpcServerV2()
require.Nil(t, err) require.Nil(t, err)
go svr.Start() go startSvr(svr)
defer svr.Stop() defer stopSvr(svr)
m1 := TestModel{ m1 := TestModel{
Name: "Test Name", Name: "Test Name",
@@ -284,7 +299,7 @@ func TestModelServiceV2_UpdateMany(t *testing.T) {
require.Nil(t, err) require.Nil(t, err)
time.Sleep(100 * time.Millisecond) time.Sleep(100 * time.Millisecond)
c, err := grpc.Dial("localhost:9666", grpc.WithTransportCredentials(insecure.NewCredentials())) c, err := grpc.NewClient("localhost:9666", grpc.WithTransportCredentials(insecure.NewCredentials()))
require.Nil(t, err) require.Nil(t, err)
c.Connect() c.Connect()
@@ -302,8 +317,8 @@ func TestModelServiceV2_ReplaceById(t *testing.T) {
defer teardownTestDB() defer teardownTestDB()
svr, err := server.NewGrpcServerV2() svr, err := server.NewGrpcServerV2()
require.Nil(t, err) require.Nil(t, err)
go svr.Start() go startSvr(svr)
defer svr.Stop() defer stopSvr(svr)
m := TestModel{ m := TestModel{
Name: "Test Name", Name: "Test Name",
@@ -314,7 +329,7 @@ func TestModelServiceV2_ReplaceById(t *testing.T) {
m.SetId(id) m.SetId(id)
time.Sleep(100 * time.Millisecond) time.Sleep(100 * time.Millisecond)
c, err := grpc.Dial("localhost:9666", grpc.WithTransportCredentials(insecure.NewCredentials())) c, err := grpc.NewClient("localhost:9666", grpc.WithTransportCredentials(insecure.NewCredentials()))
require.Nil(t, err) require.Nil(t, err)
c.Connect() c.Connect()
@@ -333,8 +348,8 @@ func TestModelServiceV2_ReplaceOne(t *testing.T) {
defer teardownTestDB() defer teardownTestDB()
svr, err := server.NewGrpcServerV2() svr, err := server.NewGrpcServerV2()
require.Nil(t, err) require.Nil(t, err)
go svr.Start() go startSvr(svr)
defer svr.Stop() defer stopSvr(svr)
m := TestModel{ m := TestModel{
Name: "Test Name", Name: "Test Name",
@@ -345,7 +360,7 @@ func TestModelServiceV2_ReplaceOne(t *testing.T) {
m.SetId(id) m.SetId(id)
time.Sleep(100 * time.Millisecond) time.Sleep(100 * time.Millisecond)
c, err := grpc.Dial("localhost:9666", grpc.WithTransportCredentials(insecure.NewCredentials())) c, err := grpc.NewClient("localhost:9666", grpc.WithTransportCredentials(insecure.NewCredentials()))
require.Nil(t, err) require.Nil(t, err)
c.Connect() c.Connect()
@@ -364,10 +379,10 @@ func TestModelServiceV2_InsertOne(t *testing.T) {
defer teardownTestDB() defer teardownTestDB()
svr, err := server.NewGrpcServerV2() svr, err := server.NewGrpcServerV2()
require.Nil(t, err) require.Nil(t, err)
go svr.Start() go startSvr(svr)
defer svr.Stop() defer stopSvr(svr)
c, err := grpc.Dial("localhost:9666", grpc.WithTransportCredentials(insecure.NewCredentials())) c, err := grpc.NewClient("localhost:9666", grpc.WithTransportCredentials(insecure.NewCredentials()))
require.Nil(t, err) require.Nil(t, err)
c.Connect() c.Connect()
@@ -388,25 +403,25 @@ func TestModelServiceV2_InsertMany(t *testing.T) {
defer teardownTestDB() defer teardownTestDB()
svr, err := server.NewGrpcServerV2() svr, err := server.NewGrpcServerV2()
require.Nil(t, err) require.Nil(t, err)
go svr.Start() go startSvr(svr)
defer svr.Stop() defer stopSvr(svr)
c, err := grpc.Dial("localhost:9666", grpc.WithTransportCredentials(insecure.NewCredentials())) c, err := grpc.NewClient("localhost:9666", grpc.WithTransportCredentials(insecure.NewCredentials()))
require.Nil(t, err) require.Nil(t, err)
c.Connect() c.Connect()
clientSvc := client.NewModelServiceV2[TestModel]() clientSvc := client.NewModelServiceV2[TestModel]()
models := []TestModel{ testModels := []TestModel{
{Name: "Test Name 1"}, {Name: "Test Name 1"},
{Name: "Test Name 2"}, {Name: "Test Name 2"},
} }
ids, err := clientSvc.InsertMany(models) ids, err := clientSvc.InsertMany(testModels)
require.Nil(t, err) require.Nil(t, err)
for i, id := range ids { for i, id := range ids {
res, err := clientSvc.GetById(id) res, err := clientSvc.GetById(id)
require.Nil(t, err) require.Nil(t, err)
assert.Equal(t, res.Name, models[i].Name) assert.Equal(t, res.Name, testModels[i].Name)
} }
} }
@@ -415,8 +430,8 @@ func TestModelServiceV2_Count(t *testing.T) {
defer teardownTestDB() defer teardownTestDB()
svr, err := server.NewGrpcServerV2() svr, err := server.NewGrpcServerV2()
require.Nil(t, err) require.Nil(t, err)
go svr.Start() go startSvr(svr)
defer svr.Stop() defer stopSvr(svr)
modelSvc := service.NewModelServiceV2[TestModel]() modelSvc := service.NewModelServiceV2[TestModel]()
for i := 0; i < 5; i++ { for i := 0; i < 5; i++ {
@@ -427,7 +442,7 @@ func TestModelServiceV2_Count(t *testing.T) {
} }
time.Sleep(100 * time.Millisecond) time.Sleep(100 * time.Millisecond)
c, err := grpc.Dial("localhost:9666", grpc.WithTransportCredentials(insecure.NewCredentials())) c, err := grpc.NewClient("localhost:9666", grpc.WithTransportCredentials(insecure.NewCredentials()))
require.Nil(t, err) require.Nil(t, err)
c.Connect() c.Connect()

1
frontend/index.html
View File

@@ -12,7 +12,6 @@
<script src="js/vue3-sfc-loader.js"></script> <script src="js/vue3-sfc-loader.js"></script>
<script src="js/login-canvas.js"></script> <script src="js/login-canvas.js"></script>
<script src="simplemde/simplemde.js"></script>
<style> <style>
#loading-placeholder { #loading-placeholder {
position: fixed; position: fixed;

15
frontend/public/simplemde/simplemde.js
View File

File diff suppressed because one or more lines are too long