fix: upgrade proto to v0.2.37

Author: MuZhou233

app/porter/internal/service/librarianporterservice.go

@@ -125,15 +125,15 @@ func (s *LibrarianPorterServiceService) PullApp(
 			Type:             ToPBAppType(a.Type),
 			ShortDescription: a.ShortDescription,
 			IconImageUrl:     "",
+			HeroImageUrl:     a.HeroImageURL,
 			Tags:             nil,
+			AppCategoryIds:   nil,
 			Details: &librarian.AppDetails{ // TODO
-				Description:  a.Description,
-				ReleaseDate:  a.ReleaseDate,
-				Developer:    a.Developer,
-				Publisher:    a.Publisher,
-				Version:      "",
-				HeroImageUrl: a.HeroImageURL,
-				LogoImageUrl: "",
+				Description: a.Description,
+				ReleaseDate: a.ReleaseDate,
+				Developer:   a.Developer,
+				Publisher:   a.Publisher,
+				Version:     "",
 			},
 		}}, nil
 	default:
@@ -163,16 +163,10 @@ func (s *LibrarianPorterServiceService) PullAccountAppRelation(
 				Type:             0,
 				ShortDescription: "",
 				IconImageUrl:     a.IconImageURL,
+				HeroImageUrl:     a.HeroImageURL,
 				Tags:             nil,
-				Details: &librarian.AppDetails{
-					Description:  "",
-					ReleaseDate:  "",
-					Developer:    "",
-					Publisher:    "",
-					Version:      "",
-					HeroImageUrl: "",
-					LogoImageUrl: a.LogoImageURL,
-				},
+				AppCategoryIds:   nil,
+				Details:          nil,
 			}
 		}
 		return &pb.PullAccountAppRelationResponse{AppList: appList}, nil

app/searcher/internal/biz/searcher.go

@@ -8,7 +8,7 @@ import (
 
 type SearcherRepo interface {
 	NewID(context.Context) (int64, error)
-	DescribeID(context.Context, model.InternalID, string) error
+	DescribeID(context.Context, model.InternalID, bool, string) error
 	SearchID(context.Context, model.Paging, string) ([]*SearchResult, error)
 }
 
@@ -41,8 +41,8 @@ func (g *Searcher) NewBatchIDs(ctx context.Context, num int) ([]int64, error) {
 	return res, nil
 }
 
-func (g *Searcher) DescribeID(ctx context.Context, id model.InternalID, description string) error {
-	return g.repo.DescribeID(ctx, id, description)
+func (g *Searcher) DescribeID(ctx context.Context, id model.InternalID, append_ bool, description string) error {
+	return g.repo.DescribeID(ctx, id, append_, description)
 }
 
 func (g *Searcher) SearchID(ctx context.Context, paging model.Paging, keyword string) ([]*SearchResult, error) {

app/searcher/internal/data/bleve.go

@@ -41,7 +41,7 @@ func NewBleve(conf *conf.Searcher_Data, app *libapp.Settings) (bleve.Index, erro
 	return index, nil
 }
 
-func (r *bleveSearcherRepo) DescribeID(ctx context.Context, id model.InternalID, description string) error {
+func (r *bleveSearcherRepo) DescribeID(ctx context.Context, id model.InternalID, _ bool, description string) error {
 	var jsonDesc interface{}
 	err := libcodec.Unmarshal(libcodec.JSON, []byte(description), &jsonDesc)
 	if err == nil {

app/searcher/internal/data/bleve_test.go

@@ -67,7 +67,7 @@ func Test_bleveSearcherRepo_SearchID(t *testing.T) {
 		if err != nil {
 			return
 		}
-		if err = r.DescribeID(context.Background(), model.InternalID(i), string(str)); err != nil {
+		if err = r.DescribeID(context.Background(), model.InternalID(i), false, string(str)); err != nil {
 			t.Errorf("DescribeID() error = %v", err)
 		}
 	}

app/searcher/internal/data/meili.go

@@ -37,23 +37,29 @@ type document struct {
 	Description interface{}
 }
 
-func (m *meiliSearcherRepo) DescribeID(ctx context.Context, id model.InternalID, description string) error {
+func (m *meiliSearcherRepo) DescribeID(
+	ctx context.Context, id model.InternalID, append_ bool, description string,
+) error {
 	var jsonDesc interface{}
 	err := libcodec.Unmarshal(libcodec.JSON, []byte(description), &jsonDesc)
+	var documents map[string]interface{}
 	if err == nil {
-		documents := map[string]interface{}{
+		documents = map[string]interface{}{
 			"id":          id,
 			"description": jsonDesc,
 		}
-		_, err = m.search.Index(IndexName).AddDocuments(documents)
-		if err != nil {
-			return err
-		}
 	} else {
-		documents := map[string]interface{}{
+		documents = map[string]interface{}{
 			"id":          id,
 			"description": description,
 		}
+	}
+	if append_ {
+		_, err = m.search.Index(IndexName).UpdateDocuments(documents)
+		if err != nil {
+			return err
+		}
+	} else {
 		_, err = m.search.Index(IndexName).AddDocuments(documents)
 		if err != nil {
 			return err

app/searcher/internal/service/librariansearcherservice.go

@@ -48,7 +48,12 @@ func (s *LibrarianSearcherServiceService) NewBatchIDs(ctx context.Context, req *
 }
 func (s *LibrarianSearcherServiceService) DescribeID(ctx context.Context, req *pb.DescribeIDRequest) (
 	*pb.DescribeIDResponse, error) {
-	err := s.uc.DescribeID(ctx, model.InternalID(req.GetId().GetId()), req.GetDescription())
+	err := s.uc.DescribeID(
+		ctx,
+		model.InternalID(req.GetId().GetId()),
+		req.GetMode() == pb.DescribeIDRequest_DESCRIBE_MODE_APPEND,
+		req.GetDescription(),
+	)
 	if err != nil {
 		return nil, err
 	}

app/searcher/internal/service/service_test.go

@@ -23,7 +23,7 @@ func (m *mockedSearcherRepo) NewID(ctx context.Context) (int64, error) {
 	return args.Get(0).(int64), args.Error(1)
 }
 
-func (m *mockedSearcherRepo) DescribeID(ctx context.Context, id model.InternalID, s string) error {
+func (m *mockedSearcherRepo) DescribeID(ctx context.Context, id model.InternalID, b bool, s string) error {
 	// TODO implement me
 	panic("implement me")
 }

app/sephirah/internal/biz/bizchesed/chesed.go

@@ -181,6 +181,7 @@ func (c *Chesed) ScanImage(ctx context.Context) {
 			Id:          converter.ToPBInternalID(image.ID),
 			Description: string(desReqStr),
 			Mode:        searcher.DescribeIDRequest_DESCRIBE_MODE_APPEND,
+			Index:       searcher.Index_INDEX_CHESED_IMAGE,
 		})
 		if err != nil {
 			return
@@ -223,6 +224,7 @@ func (c *Chesed) SearchImages(ctx context.Context, paging model.Paging, keywords
 				PageSize: int32(paging.PageSize),
 			},
 			Keyword: keywords,
+			Index:   searcher.Index_INDEX_CHESED_IMAGE,
 		},
 	)
 	if err != nil {

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

@@ -126,6 +126,9 @@ func (g *Gebura) GetApp(ctx context.Context, id model.InternalID) (*modelgebura.
 	if len(internalApp.IconImageURL) == 0 {
 		internalApp.IconImageURL = steamApp.IconImageURL
 	}
+	if len(internalApp.HeroImageURL) == 0 {
+		internalApp.HeroImageURL = steamApp.HeroImageURL
+	}
 	if internalApp.Details == nil { //nolint:nestif //TODO
 		internalApp.Details = steamApp.Details
 	} else if steamApp.Details != nil {
@@ -144,12 +147,6 @@ func (g *Gebura) GetApp(ctx context.Context, id model.InternalID) (*modelgebura.
 		if len(internalApp.Details.Version) == 0 {
 			internalApp.Details.Version = steamApp.Details.Version
 		}
-		if len(internalApp.Details.HeroImageURL) == 0 {
-			internalApp.Details.HeroImageURL = steamApp.Details.HeroImageURL
-		}
-		if len(internalApp.Details.LogoImageURL) == 0 {
-			internalApp.Details.LogoImageURL = steamApp.Details.LogoImageURL
-		}
 	}
 	return internalApp, nil
 }

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

@@ -27,7 +27,7 @@ type TipherethRepo interface {
 		*model.InternalID) ([]*modeltiphereth.User, int64, error)
 	LinkAccount(context.Context, modeltiphereth.Account, model.InternalID) error
 	UnLinkAccount(context.Context, modeltiphereth.Account, model.InternalID) error
-	ListLinkAccounts(context.Context, model.Paging, model.InternalID) ([]*modeltiphereth.Account, int64, error)
+	ListLinkAccounts(context.Context, model.InternalID) ([]*modeltiphereth.Account, error)
 	GetUser(context.Context, model.InternalID) (*modeltiphereth.User, error)
 }
 
@@ -356,21 +356,21 @@ func (t *Tiphereth) UnLinkAccount(ctx context.Context, a modeltiphereth.Account)
 }
 
 func (t *Tiphereth) ListLinkAccounts(
-	ctx context.Context, paging model.Paging, id model.InternalID,
-) ([]*modeltiphereth.Account, int64, *errors.Error) {
+	ctx context.Context, id model.InternalID,
+) ([]*modeltiphereth.Account, *errors.Error) {
 	if !libauth.FromContextAssertUserType(ctx, libauth.UserTypeAdmin, libauth.UserTypeNormal) {
-		return nil, 0, pb.ErrorErrorReasonForbidden("no permission")
+		return nil, pb.ErrorErrorReasonForbidden("no permission")
 	}
 	claims, exist := libauth.FromContext(ctx)
 	if !exist {
-		return nil, 0, pb.ErrorErrorReasonUnauthorized("invalid token")
+		return nil, pb.ErrorErrorReasonUnauthorized("invalid token")
 	}
 	if id == 0 {
 		id = claims.InternalID
 	}
-	a, total, err := t.repo.ListLinkAccounts(ctx, paging, id)
+	a, err := t.repo.ListLinkAccounts(ctx, id)
 	if err != nil {
-		return nil, 0, pb.ErrorErrorReasonUnspecified("%s", err.Error())
+		return nil, pb.ErrorErrorReasonUnspecified("%s", err.Error())
 	}
-	return a, total, nil
+	return a, nil
 }