feat: remove mapper

app/sephirah/internal/biz/bizangela/angela.go

@@ -13,7 +13,6 @@ import (
 	"github.com/tuihub/librarian/internal/lib/libmq"
 	"github.com/tuihub/librarian/internal/model"
 	"github.com/tuihub/librarian/internal/model/modelfeed"
-	mapper "github.com/tuihub/protos/pkg/librarian/mapper/v1"
 	porter "github.com/tuihub/protos/pkg/librarian/porter/v1"
 
 	"github.com/google/wire"
@@ -40,10 +39,10 @@ type Angela struct {
 	mq *libmq.MQ
 }
 type AngelaBase struct {
-	repo     AngelaRepo
-	supv     *supervisor.Supervisor
-	g        bizgebura.GeburaRepo
-	mapper   mapper.LibrarianMapperServiceClient
+	repo AngelaRepo
+	supv *supervisor.Supervisor
+	g    bizgebura.GeburaRepo
+	// mapper   mapper.LibrarianMapperServiceClient
 	searcher *client.Searcher
 	porter   porter.LibrarianPorterServiceClient
 }
@@ -63,15 +62,15 @@ func NewAngelaBase(
 	repo AngelaRepo,
 	supv *supervisor.Supervisor,
 	g bizgebura.GeburaRepo,
-	mClient mapper.LibrarianMapperServiceClient,
+	// mClient mapper.LibrarianMapperServiceClient,
 	pClient porter.LibrarianPorterServiceClient,
 	sClient *client.Searcher,
 ) (*AngelaBase, error) {
 	return &AngelaBase{
-		repo:     repo,
-		supv:     supv,
-		g:        g,
-		mapper:   mClient,
+		repo: repo,
+		supv: supv,
+		g:    g,
+		//mapper:   mClient,
 		porter:   pClient,
 		searcher: sClient,
 	}, nil

app/sephirah/internal/biz/bizbinah/binah.go

@@ -7,15 +7,14 @@ import (
 
 	"github.com/tuihub/librarian/app/sephirah/internal/model/modelbinah"
 	"github.com/tuihub/librarian/internal/lib/libauth"
-	mapper "github.com/tuihub/protos/pkg/librarian/mapper/v1"
 	searcher "github.com/tuihub/protos/pkg/librarian/searcher/v1"
 )
 
 type Binah struct {
 	repo     BinahRepo
 	callback *modelbinah.ControlBlock
 	auth     *libauth.Auth
-	mapper   mapper.LibrarianMapperServiceClient
+	// mapper   mapper.LibrarianMapperServiceClient
 	searcher searcher.LibrarianSearcherServiceClient
 }
 
@@ -37,14 +36,14 @@ func NewBinah(
 	repo BinahRepo,
 	callback *modelbinah.ControlBlock,
 	auth *libauth.Auth,
-	mClient mapper.LibrarianMapperServiceClient,
+	// mClient mapper.LibrarianMapperServiceClient,
 	sClient searcher.LibrarianSearcherServiceClient,
 ) *Binah {
 	return &Binah{
 		repo:     repo,
 		callback: callback,
 		auth:     auth,
-		mapper:   mClient,
+		//mapper:   mClient,
 		searcher: sClient,
 	}
 }

app/sephirah/internal/biz/bizgebura/app.go

@@ -10,7 +10,6 @@ import (
 	"github.com/tuihub/librarian/app/sephirah/internal/model/modelgebura"
 	"github.com/tuihub/librarian/internal/lib/libauth"
 	"github.com/tuihub/librarian/internal/model"
-	mapper "github.com/tuihub/protos/pkg/librarian/mapper/v1"
 	searcherpb "github.com/tuihub/protos/pkg/librarian/searcher/v1"
 	pb "github.com/tuihub/protos/pkg/librarian/sephirah/v1"
 
@@ -30,14 +29,14 @@ func (g *Gebura) CreateApp(ctx context.Context, app *modelgebura.App) (*modelgeb
 	app.SourceAppID = strconv.FormatInt(int64(app.ID), 10)
 	app.SourceURL = ""
 	app.BoundInternal = app.ID
-	if _, err = g.mapper.InsertVertex(ctx, &mapper.InsertVertexRequest{
-		VertexList: []*mapper.Vertex{{
-			Vid:  int64(app.ID),
-			Type: mapper.VertexType_VERTEX_TYPE_ABSTRACT,
-		}},
-	}); err != nil {
-		return nil, pb.ErrorErrorReasonUnspecified("%s", err.Error())
-	}
+	// if _, err = g.mapper.InsertVertex(ctx, &mapper.InsertVertexRequest{
+	//	VertexList: []*mapper.Vertex{{
+	//		Vid:  int64(app.ID),
+	//		Type: mapper.VertexType_VERTEX_TYPE_ABSTRACT,
+	//	}},
+	// }); err != nil {
+	//	return nil, pb.ErrorErrorReasonUnspecified("%s", err.Error())
+	//}
 	if err = g.repo.CreateApp(ctx, app); err != nil {
 		return nil, pb.ErrorErrorReasonUnspecified("%s", err.Error())
 	}

app/sephirah/internal/biz/bizgebura/app_package.go

@@ -29,14 +29,14 @@ func (g *Gebura) CreateAppPackage(
 	a.ID = id
 	a.Source = modelgebura.AppPackageSourceManual
 	a.SourceID = 0
-	if _, err = g.mapper.InsertVertex(ctx, &mapper.InsertVertexRequest{
-		VertexList: []*mapper.Vertex{{
-			Vid:  int64(a.ID),
-			Type: mapper.VertexType_VERTEX_TYPE_ABSTRACT,
-		}},
-	}); err != nil {
-		return nil, pb.ErrorErrorReasonUnspecified("%s", err.Error())
-	}
+	// if _, err = g.mapper.InsertVertex(ctx, &mapper.InsertVertexRequest{
+	//	VertexList: []*mapper.Vertex{{
+	//		Vid:  int64(a.ID),
+	//		Type: mapper.VertexType_VERTEX_TYPE_ABSTRACT,
+	//	}},
+	// }); err != nil {
+	//	return nil, pb.ErrorErrorReasonUnspecified("%s", err.Error())
+	//}
 	if err = g.repo.CreateAppPackage(ctx, claims.UserID, a); err != nil {
 		return nil, pb.ErrorErrorReasonUnspecified("%s", err.Error())
 	}
@@ -145,9 +145,9 @@ func (r *reportAppPackageHandler) Handle(ctx context.Context, binaries []*modelg
 		packages[i].SourceID = r.sourceID
 	}
 	if len(vl) > 0 {
-		if _, err = r.g.mapper.InsertVertex(ctx, &mapper.InsertVertexRequest{VertexList: vl}); err != nil {
-			return pb.ErrorErrorReasonUnspecified("%s", err.Error())
-		}
+		// if _, err = r.g.mapper.InsertVertex(ctx, &mapper.InsertVertexRequest{VertexList: vl}); err != nil {
+		//	return pb.ErrorErrorReasonUnspecified("%s", err.Error())
+		//}
 		if err = r.g.repo.UpsertAppPackages(ctx, r.sourceID, packages); err != nil {
 			return pb.ErrorErrorReasonUnspecified("%s", err.Error())
 		}

app/sephirah/internal/biz/bizgebura/gebura.go

@@ -11,7 +11,6 @@ import (
 	"github.com/tuihub/librarian/internal/lib/libcache"
 	"github.com/tuihub/librarian/internal/lib/libmq"
 	"github.com/tuihub/librarian/internal/model"
-	mapper "github.com/tuihub/protos/pkg/librarian/mapper/v1"
 
 	"github.com/go-kratos/kratos/v2/errors"
 )
@@ -47,9 +46,9 @@ type GeburaRepo interface {
 }
 
 type Gebura struct {
-	auth           *libauth.Auth
-	repo           GeburaRepo
-	mapper         mapper.LibrarianMapperServiceClient
+	auth *libauth.Auth
+	repo GeburaRepo
+	// mapper         mapper.LibrarianMapperServiceClient
 	searcher       *client.Searcher
 	updateAppIndex *libmq.Topic[modelangela.UpdateAppIndex]
 	pullApp        *libmq.Topic[modelangela.PullApp]
@@ -59,16 +58,16 @@ type Gebura struct {
 func NewGebura(
 	repo GeburaRepo,
 	auth *libauth.Auth,
-	mClient mapper.LibrarianMapperServiceClient,
+	// mClient mapper.LibrarianMapperServiceClient,
 	sClient *client.Searcher,
 	updateAppIndex *libmq.Topic[modelangela.UpdateAppIndex],
 	pullApp *libmq.Topic[modelangela.PullApp],
 	appCache *libcache.Map[modelgebura.AppID, modelgebura.App],
 ) *Gebura {
 	return &Gebura{
-		auth:           auth,
-		repo:           repo,
-		mapper:         mClient,
+		auth: auth,
+		repo: repo,
+		//mapper:         mClient,
 		searcher:       sClient,
 		updateAppIndex: updateAppIndex,
 		pullApp:        pullApp,

app/sephirah/internal/biz/biztiphereth/tiphereth.go

@@ -12,7 +12,6 @@ import (
 	"github.com/tuihub/librarian/internal/lib/libmq"
 	"github.com/tuihub/librarian/internal/lib/logger"
 	"github.com/tuihub/librarian/internal/model"
-	mapper "github.com/tuihub/protos/pkg/librarian/mapper/v1"
 )
 
 type TipherethRepo interface {
@@ -43,11 +42,11 @@ type TipherethRepo interface {
 }
 
 type Tiphereth struct {
-	app         *libapp.Settings
-	auth        *libauth.Auth
-	repo        TipherethRepo
-	supv        *supervisor.Supervisor
-	mapper      mapper.LibrarianMapperServiceClient
+	app  *libapp.Settings
+	auth *libauth.Auth
+	repo TipherethRepo
+	supv *supervisor.Supervisor
+	// mapper      mapper.LibrarianMapperServiceClient
 	searcher    *client.Searcher
 	pullAccount *libmq.Topic[modeltiphereth.PullAccountInfo]
 }
@@ -57,17 +56,17 @@ func NewTiphereth(
 	repo TipherethRepo,
 	auth *libauth.Auth,
 	supv *supervisor.Supervisor,
-	mClient mapper.LibrarianMapperServiceClient,
+	// mClient mapper.LibrarianMapperServiceClient,
 	sClient *client.Searcher,
 	pullAccount *libmq.Topic[modeltiphereth.PullAccountInfo],
 	cron *libcron.Cron,
 ) (*Tiphereth, error) {
 	t := &Tiphereth{
-		app:         app,
-		auth:        auth,
-		repo:        repo,
-		supv:        supv,
-		mapper:      mClient,
+		app:  app,
+		auth: auth,
+		repo: repo,
+		supv: supv,
+		//mapper:      mClient,
 		searcher:    sClient,
 		pullAccount: pullAccount,
 	}
@@ -112,15 +111,15 @@ func (t *Tiphereth) CreateConfiguredAdmin() {
 		return
 	}
 	user.ID = id
-	if _, err = t.mapper.InsertVertex(ctx, &mapper.InsertVertexRequest{VertexList: []*mapper.Vertex{
-		{
-			Vid:  int64(user.ID),
-			Type: mapper.VertexType_VERTEX_TYPE_ABSTRACT,
-			Prop: nil,
-		},
-	}}); err != nil {
-		return
-	}
+	// if _, err = t.mapper.InsertVertex(ctx, &mapper.InsertVertexRequest{VertexList: []*mapper.Vertex{
+	//	{
+	//		Vid:  int64(user.ID),
+	//		Type: mapper.VertexType_VERTEX_TYPE_ABSTRACT,
+	//		Prop: nil,
+	//	},
+	// }}); err != nil {
+	//	return
+	//}
 	if err = t.repo.CreateUser(ctx, user, user.ID); err != nil {
 		logger.Infof("repo CreateUser failed: %s", err.Error())
 		return

app/sephirah/internal/biz/biztiphereth/user.go

@@ -9,7 +9,6 @@ import (
 	"github.com/tuihub/librarian/internal/lib/libauth"
 	"github.com/tuihub/librarian/internal/lib/logger"
 	"github.com/tuihub/librarian/internal/model"
-	mapper "github.com/tuihub/protos/pkg/librarian/mapper/v1"
 	pb "github.com/tuihub/protos/pkg/librarian/sephirah/v1"
 
 	"github.com/go-kratos/kratos/v2/errors"
@@ -39,15 +38,15 @@ func (t *Tiphereth) CreateUser(ctx context.Context, user *modeltiphereth.User) (
 		return nil, pb.ErrorErrorReasonUnspecified("%s", err)
 	}
 	user.ID = id
-	if _, err = t.mapper.InsertVertex(ctx, &mapper.InsertVertexRequest{VertexList: []*mapper.Vertex{
-		{
-			Vid:  int64(user.ID),
-			Type: mapper.VertexType_VERTEX_TYPE_ABSTRACT,
-			Prop: nil,
-		},
-	}}); err != nil {
-		return nil, pb.ErrorErrorReasonUnspecified("%s", err.Error())
-	}
+	// if _, err = t.mapper.InsertVertex(ctx, &mapper.InsertVertexRequest{VertexList: []*mapper.Vertex{
+	//	{
+	//		Vid:  int64(user.ID),
+	//		Type: mapper.VertexType_VERTEX_TYPE_ABSTRACT,
+	//		Prop: nil,
+	//	},
+	// }}); err != nil {
+	//	return nil, pb.ErrorErrorReasonUnspecified("%s", err.Error())
+	//}
 	if err = t.repo.CreateUser(ctx, user, claims.UserID); err != nil {
 		logger.Infof("repo CreateUser failed: %s", err.Error())
 		return nil, pb.ErrorErrorReasonUnspecified("%s", err.Error())