暂存

internal/query/audit/resources.go

@@ -9,6 +9,7 @@ import (
 	"gorm.io/gorm"
 
 	"github.com/break/junhong_cmp_fiber/internal/model"
+	retentionquery "github.com/break/junhong_cmp_fiber/internal/query/retention"
 	"github.com/break/junhong_cmp_fiber/pkg/constants"
 	"github.com/break/junhong_cmp_fiber/pkg/errors"
 )
@@ -17,16 +18,18 @@ import (
 type ResourceSearchFilter struct {
 	ResourceType string
 	Keyword      string
+	OnlineFrom   time.Time
 	Page         int
 	PageSize     int
 }
 
 // ResourceSearchPage 是资源候选稳定分页结果。
 type ResourceSearchPage struct {
-	Total    int64               `json:"total"`
-	Page     int                 `json:"page"`
-	PageSize int                 `json:"page_size"`
-	Items    []ResourceCandidate `json:"items"`
+	Total     int64               `json:"total"`
+	Page      int                 `json:"page"`
+	PageSize  int                 `json:"page_size"`
+	Items     []ResourceCandidate `json:"items"`
+	Retention retentionquery.Info `json:"retention"`
 }
 
 // ResourceCandidate 是当前业务表或历史事件快照解析出的稳定资源候选。
@@ -59,6 +62,11 @@ func (q *Query) SearchResources(ctx context.Context, filter ResourceSearchFilter
 	if filter.Keyword == "" || !searchableResourceType(filter.ResourceType) {
 		return nil, errors.New(errors.CodeInvalidParam)
 	}
+	retention, err := retentionquery.Load(ctx, q.db, retentionquery.SourceAudit)
+	if err != nil {
+		return nil, err
+	}
+	filter.OnlineFrom = retention.OnlineFrom
 	filter.Page, filter.PageSize = normalizePage(filter.Page, filter.PageSize)
 	items, total, err := q.searchCurrent(ctx, filter)
 	if err != nil {
@@ -70,7 +78,7 @@ func (q *Query) SearchResources(ctx context.Context, filter ResourceSearchFilter
 			return nil, err
 		}
 	}
-	return &ResourceSearchPage{Total: total, Page: filter.Page, PageSize: filter.PageSize, Items: items}, nil
+	return &ResourceSearchPage{Total: total, Page: filter.Page, PageSize: filter.PageSize, Items: items, Retention: retention}, nil
 }
 
 // ResourceTimeline 查询注册资源作为任意关系参与的统一事件时间线。
@@ -196,7 +204,7 @@ func (q *Query) searchHistorical(ctx context.Context, filter ResourceSearchFilte
 
 func (q *Query) historicalIdentifierQuery(ctx context.Context, filter ResourceSearchFilter) *gorm.DB {
 	query := q.db.WithContext(ctx).Model(&model.AuditEventResource{}).
-		Where("resource_type = ? AND resource_id IS NOT NULL", filter.ResourceType)
+		Where("resource_type = ? AND resource_id IS NOT NULL AND created_at >= ?", filter.ResourceType, filter.OnlineFrom.UTC())
 	switch filter.ResourceType {
 	case constants.AuditResourceIotCard:
 		return query.Where("resource_key = ? OR identity_snapshot ->> 'iccid' = ? OR identity_snapshot ->> 'iccid_19' = ? OR identity_snapshot ->> 'iccid_20' = ? OR identity_snapshot ->> 'virtual_no' = ?", filter.Keyword, filter.Keyword, filter.Keyword, filter.Keyword, filter.Keyword)