路线图关联关系倒序排序

ecodeclub · Jul 21, 2024 · f29365f · f29365f
1 parent ab6902a
commit f29365f
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 17 deletions.
diff --git a/internal/roadmap/internal/integration/admin_test.go b/internal/roadmap/internal/integration/admin_test.go
@@ -313,9 +313,9 @@ func (s *AdminHandlerTestSuite) TestDetail() {
 	}).Error
 	require.NoError(s.T(), err)
 	edges := []dao.Edge{
-		{Id: 1, Rid: 1, SrcBiz: domain.BizQuestionSet, SrcId: 1, DstBiz: domain.BizQuestion, DstId: 2},
-		{Id: 2, Rid: 1, SrcBiz: domain.BizQuestion, SrcId: 2, DstBiz: domain.BizQuestionSet, DstId: 3},
-		{Id: 3, Rid: 2, SrcBiz: domain.BizQuestion, SrcId: 2, DstBiz: domain.BizQuestionSet, DstId: 3},
+		{Id: 1, Rid: 1, SrcBiz: domain.BizQuestionSet, SrcId: 1, DstBiz: domain.BizQuestion, DstId: 2, Utime: 123},
+		{Id: 2, Rid: 1, SrcBiz: domain.BizQuestion, SrcId: 2, DstBiz: domain.BizQuestionSet, DstId: 3, Utime: 124},
+		{Id: 3, Rid: 2, SrcBiz: domain.BizQuestion, SrcId: 2, DstBiz: domain.BizQuestionSet, DstId: 3, Utime: 125},
 	}
 	err = db.Create(&edges).Error
 	require.NoError(s.T(), err)
@@ -340,19 +340,6 @@ func (s *AdminHandlerTestSuite) TestDetail() {
 					BizTitle: "题目123",
 					Utime:    222,
 					Edges: []web.Edge{
-						{
-							Id: 1,
-							Src: web.Node{
-								Biz:   domain.BizQuestionSet,
-								BizId: 1,
-								Title: "题集1",
-							},
-							Dst: web.Node{
-								Biz:   domain.BizQuestion,
-								BizId: 2,
-								Title: "题目2",
-							},
-						},
 						{
 							Id: 2,
 							Src: web.Node{
@@ -366,6 +353,19 @@ func (s *AdminHandlerTestSuite) TestDetail() {
 								Title: "题集3",
 							},
 						},
+						{
+							Id: 1,
+							Src: web.Node{
+								Biz:   domain.BizQuestionSet,
+								BizId: 1,
+								Title: "题集1",
+							},
+							Dst: web.Node{
+								Biz:   domain.BizQuestion,
+								BizId: 2,
+								Title: "题目2",
+							},
+						},
 					},
 				},
 			},

diff --git a/internal/roadmap/internal/repository/dao/admin.go b/internal/roadmap/internal/repository/dao/admin.go
@@ -50,7 +50,8 @@ func (dao *GORMAdminDAO) AddEdge(ctx context.Context, edge Edge) error {
 
 func (dao *GORMAdminDAO) GetEdgesByRid(ctx context.Context, rid int64) ([]Edge, error) {
 	var res []Edge
-	err := dao.db.WithContext(ctx).Where("rid = ?", rid).Find(&res).Error
+	// 按照更新时间倒序排序
+	err := dao.db.WithContext(ctx).Where("rid = ?", rid).Order("utime DESC").Find(&res).Error
 	return res, err
 }