feat: internal product items

services/message/internal/logic/apiMessageLogic.go

@@ -2,14 +2,13 @@ package logic
 
 import (
 	"context"
-	"lone-services/pkg/modelbase"
-	"lone-services/pkg/utils"
-	"lone-services/services/message/internal/dao"
-	"lone-services/services/message/internal/model"
-	"lone-services/services/message/validator"
 	"strconv"
 
-	"lone-services/rpc/message/pb"
+	"lone-services/pkg/modelbase"
+	"lone-services/pkg/utils"
+	message "lone-services/rpc/message/pb"
+	"lone-services/services/message/internal/dao"
+	"lone-services/services/message/internal/model"
 	"lone-services/services/message/internal/svc"
 
 	"github.com/zeromicro/go-zero/core/logx"
@@ -30,37 +29,51 @@ func NewApiMessageLogic(ctx context.Context, svcCtx *svc.ServiceContext) *ApiMes
 	}
 }
 
-func (l *ApiMessageLogic) ApiMessage(in *message.ItemsRequest) (*message.Response, error) {
-	var v validator.MessageItemsValidator
-	if fail := l.checkParams(in, &v); fail != nil {
-		return fail, nil
-	}
-	adminInfo := utils.GetUserFromCtx(l.ctx)
-	if adminInfo.ID < utils.NumberOne {
+func (l *ApiMessageLogic) ApiMessage(in *message.ApiMessageNumberRequest) (*message.Response, error) {
+	loginUser := utils.GetUserFromCtx(l.ctx)
+	if loginUser.ID < utils.NumberOne {
 		return l.fail(utils.ErrorNoLoginInfo)
 	}
+
+	eq := map[string]string{
+		"target_id": strconv.FormatInt(loginUser.ID, utils.NumberTen),
+	}
+	if in.Type > utils.NumberZero {
+		eq["type"] = strconv.Itoa(int(in.Type))
+	}
+
 	var info []dao.MessageInfo
 	w := modelbase.Params{
-		Page:  int(in.Page),
-		Size:  int(in.Size),
+		Page:  modelbase.DefaultPage,
+		Size:  10,
 		Order: "id desc",
+		Eq:    eq,
 	}
 
-	items, err := model.MessageModel{}.Init().Page(w, &info)
+	messageModel := model.MessageModel{}.Init()
+	_, err := messageModel.Page(w, &info)
 	if err != nil {
-		l.Logger.Error("get message list failed", err)
+		l.Errorf("get message list failed: %v", err)
 		return l.fail(utils.Fail)
 	}
-	var ids []string
-	for _, v := range info {
-		ids = append(ids, strconv.Itoa(int(v.Id)))
+
+	if len(info) > utils.NumberZero {
+		ids := make([]string, 0, len(info))
+		for _, row := range info {
+			ids = append(ids, strconv.FormatInt(row.Id, utils.NumberTen))
+		}
+		_, editErr := messageModel.Edit(modelbase.Params{
+			In: map[string][]string{"id": ids},
+			Eq: map[string]string{"target_id": strconv.FormatInt(loginUser.ID, utils.NumberTen)},
+		}, &dao.MessageStatus{Status: utils.StatusOk})
+		if editErr != nil {
+			l.Errorf("mark message read failed: %v", editErr)
+			return l.fail(utils.Fail)
+		}
+		for i := range info {
+			info[i].Status = utils.StatusOk
+		}
 	}
 
-	if len(ids) > utils.NumberZero {
-		status := dao.MessageStatus{Status: utils.StatusOk}
-
-		ww := modelbase.Params{In: map[string][]string{"id": ids}}
-		_, err = model.MessageModel{}.Init().Edit(ww, &status)
-	}
-	return l.ok(items)
+	return l.ok(info)
 }