Merge pull request #293 from sixwaaaay/metadata

sixwaaaay · web-flow · commit 34b3fd43e495 · 2025-04-19T23:41:06.000+08:00
feat: container metadata
diff --git a/.github/workflows/comment.yaml b/.github/workflows/comment.yaml
@@ -82,36 +82,15 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      - uses: docker/build-push-action@v5
+      - uses: docker/metadata-action@v5
+        id: meta
         with:
-          context: ./graal
-          file: ./graal/Dockerfile
-          push: true
-          tags: ${{ secrets.DOCKERHUB_USERNAME }}/sharing-comment:prerelease
+          images: ${{ secrets.DOCKERHUB_USERNAME }}/sharing-comment
 
-  release:
-    runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: ./graal
-    if: github.ref == 'refs/heads/main'
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - uses: graalvm/setup-graalvm@v1
-        with:
-          java-version: '21'
-          distribution: 'graalvm' # See 'Options' for all available distributions
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-      - name: Native Image Build
-        run: mvn -Pnative spring-boot:build-image -DskipTests
 
-      - uses: docker/login-action@v3
+      - uses: docker/build-push-action@v5
         with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Push to Docker Hub
-        run: |
-          docker tag sharing-comment:0.0.1-SNAPSHOT ${{ secrets.DOCKERHUB_USERNAME }}/sharing-comment:latest
-          docker push ${{ secrets.DOCKERHUB_USERNAME }}/sharing-comment:latest
+          context: ./graal
+          file: ./graal/Dockerfile
+          push: ${{ github.event != 'pull_request' }}
+          tags: ${{ steps.meta.outputs.tags}}
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -35,13 +35,22 @@ jobs:
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ secrets.DOCKERHUB_USERNAME || 'app' }}/${{ matrix.tag }}
+
       - name: Build and push
         uses: docker/build-push-action@v5
         with:
           context: ${{ matrix.context }}
           file: ${{ matrix.file }}
           push: true
-          tags: ${{ secrets.DOCKERHUB_USERNAME || 'app' }}/${{ matrix.tag }}:${{ github.ref_name }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels}}
+
   graal:
     runs-on: ubuntu-latest
     defaults:
@@ -56,14 +65,23 @@ jobs:
           distribution: 'graalvm' # See 'Options' for all available distributions
           github-token: ${{ secrets.GITHUB_TOKEN }}
       - name: Native Image Build
-        run: mvn -Pnative spring-boot:build-image -DskipTests
+        run: mvn clean && mvn -Pnative -Pproduction native:compile -DskipTests -P!openapi
+
+      - uses: docker/metadata-action@v5
+        id: meta
+        with:
+          images: ${{ secrets.DOCKERHUB_USERNAME }}/sharing-comment
 
       - uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      - name: Push to Docker Hub
-        run: |
-          docker tag sharing-comment:0.0.1-SNAPSHOT ${{ secrets.DOCKERHUB_USERNAME }}/sharing-comment:${{ github.ref_name }}
-          docker push ${{ secrets.DOCKERHUB_USERNAME }}/sharing-comment:${{ github.ref_name }}
+      - name: Build and push
+        uses: docker/build-push-action@v5
+        with:
+          context: ./graal
+          file: ./graal/Dockerfile
+          push: true
+          tags: ${{ steps.meta.outputs.tags}}
+          labels: ${{ steps.meta.outputs.labels }}
diff --git a/sharp/content.Tests/UnitTest.cs b/sharp/content.Tests/UnitTest.cs
@@ -72,6 +72,7 @@ public async Task Test1()
         var (_, videos4) = await videoRepository.DailyPopularVideos(0, 10);
         Assert.NotNull(videos4);
         Assert.NotEmpty(videos4);
+        await videoRepository.IncrementViewCount(1);
     }
 
     [Fact(DisplayName = "Command")]
diff --git a/sharp/content.Tests/domainservice/Test.cs b/sharp/content.Tests/domainservice/Test.cs
@@ -2,7 +2,6 @@
 using content.repository;
 using Moq;
 using Qdrant.Client;
-using Qdrant.Client.Grpc;
 
 public class HistoryServiceTests
 {
@@ -13,14 +12,15 @@ public async Task GetHistory_ReturnsVideos()
         var mockHistoryRepo = new Mock<HistoryRepository>(null!);
         var mockClient = new Mock<QdrantClient>("localhost",default!,default!,default!,default!,default!);
         var mockDomainService = new Mock<IDomainService>();
+        var mockIVideoRepository = new Mock<IVideoRepository>();
         var userId = 1L;
         var historyList = new List<long> { 1L, 2L };
         var videoDtos = new List<VideoDto> { new VideoDto(), new VideoDto() };
 
         mockHistoryRepo.Setup(x => x.GetHistorys(userId, It.IsAny<long>(), It.IsAny<int>())).ReturnsAsync(historyList);
         mockDomainService.Setup(x => x.FindAllByIds(historyList)).ReturnsAsync(videoDtos);
 
-        var service = new HistoryService(mockHistoryRepo.Object, mockClient.Object, mockDomainService.Object);
+        var service = new HistoryService(mockHistoryRepo.Object, mockClient.Object, mockDomainService.Object, mockIVideoRepository.Object);
 
         // Act
         var result = await service.GetHistory(userId);
@@ -36,13 +36,13 @@ public async Task AddHistory_ReturnsTrue()
         var mockHistoryRepo = new Mock<HistoryRepository>(null!);
         var mockClient = new Mock<QdrantClient>("localhost",default!,default!,default!,default!,default!);
         var mockDomainService = new Mock<IDomainService>();
-
+        var mockIVideoRepository = new Mock<IVideoRepository>();
         var userId = 1L;
         var videoId = 2L;
 
         mockHistoryRepo.Setup(x => x.AddHistory(userId, videoId)).Returns(Task.FromResult(1L));
-
-        var service = new HistoryService(mockHistoryRepo.Object, mockClient.Object, mockDomainService.Object);
+        mockIVideoRepository.Setup(x => x.IncrementViewCount(videoId)).Returns(Task.CompletedTask);
+        var service = new HistoryService(mockHistoryRepo.Object, mockClient.Object, mockDomainService.Object, mockIVideoRepository.Object);
 
         // Act
         var result = await service.AddHistory(userId, videoId);
diff --git a/sharp/content/domainservice/HistoryService.cs b/sharp/content/domainservice/HistoryService.cs
@@ -7,7 +7,7 @@ namespace content.domainservice;
 
 public record AddVideoHistory([property: JsonNumberHandling(JsonNumberHandling.AllowReadingFromString)] long VideoId);
 
-public class HistoryService(HistoryRepository history, QdrantClient client, IDomainService domain)
+public class HistoryService(HistoryRepository history, QdrantClient client, IDomainService domain,IVideoRepository video)
 {
 
     public async Task<Pagination<VideoDto>> GetHistory(long userId, long page = 0, int size = 10)
@@ -19,6 +19,7 @@ public async Task<Pagination<VideoDto>> GetHistory(long userId, long page = 0, i
     public async Task<bool> AddHistory(long userId, long videoId)
     {
         await history.AddHistory(userId, videoId);
+        await video.IncrementViewCount(videoId);
         return true;
     }
 
diff --git a/sharp/content/repository/Client.cs b/sharp/content/repository/Client.cs
@@ -54,7 +54,7 @@ public class UserRepository(HttpClient client) : IUserRepository
 {
     public string? Token { get; set; }
 
-    /// <summary> Find user information by id. </summary>
+    /// <inheritdoc />
     public async Task<User> FindById(long id)
     {
         var req = new HttpRequestMessage(HttpMethod.Get, $"/users/{id}");
@@ -65,7 +65,7 @@ public async Task<User> FindById(long id)
     }
 
 
-    /// <summary> Find user information by id list. </summary>
+    /// <inheritdoc />
     public async Task<IReadOnlyList<User>> FindAllByIds(IEnumerable<long> ids)
     {
         var req = new HttpRequestMessage(HttpMethod.Get,
@@ -102,7 +102,7 @@ public class VoteRepository(HttpClient client) : IVoteRepository
 {
     public string? Token { get; set; }
 
-    /// <summary> Get voted status of videos. </summary>
+    /// <inheritdoc />
     public async Task<IReadOnlyList<long>> VotedOfVideos(List<long> videoIds)
     {
         if (string.IsNullOrEmpty(Token) || videoIds.Count == 0)
@@ -126,7 +126,7 @@ public async Task<IReadOnlyList<long>> VotedOfVideos(List<long> videoIds)
     }
 
 
-    /// <summary> Scan voted videos, which means paging through all voted videos. </summary>
+    /// <inheritdoc />
     public async Task<(long?, IReadOnlyList<long>)> VotedVideos(long page, int size)
     {
         var url = $"/graph/videos?page={page}&size={size}";
@@ -233,10 +233,10 @@ public static IServiceCollection AddUserRepository(this IServiceCollection servi
     public static IApplicationBuilder UseToken(this IApplicationBuilder app) =>
         app.Use(async (context, next) =>
         {
-            var userRepository = context.RequestServices.GetService<IUserRepository>();
-            ArgumentNullException.ThrowIfNull(userRepository, nameof(userRepository));
             var authorization = context.Request.Headers.Authorization;
 
+            var userRepository = context.RequestServices.GetService<IUserRepository>();
+            ArgumentNullException.ThrowIfNull(userRepository, nameof(userRepository));
             userRepository.Token = authorization;
 
             var voteRepository = context.RequestServices.GetService<IVoteRepository>();
diff --git a/sharp/content/repository/Content.cs b/sharp/content/repository/Content.cs
@@ -52,6 +52,7 @@ public interface IVideoRepository
     Task<IReadOnlyList<Video>> FindRecent(long page, int size);
     Task<(long, IReadOnlyList<Video>)> DailyPopularVideos(long page, int size);
     Task<Video> Save(Video video);
+    Task IncrementViewCount(long id);
 }
 
 public class VideoRepository(NpgsqlDataSource dataSource) : IVideoRepository
@@ -150,6 +151,16 @@ public async Task<Video> Save(Video video)
         );
         return result;
     }
+
+    public async Task IncrementViewCount(long id)
+    {
+        await using var connection = await dataSource.OpenConnectionAsync();
+        await connection.ExecuteAsync(
+            "UPDATE videos SET view_count = view_count + 1 WHERE id = @id",
+            new { id }
+        );
+    }
+
 }
 
 /// <summary> The extensions for the video repository. </summary>

Original file line number	Diff line number	Diff line change
`@@ -72,6 +72,7 @@ public async Task Test1()`
`72`	`72`	`var (_, videos4) = await videoRepository.DailyPopularVideos(0, 10);`
`73`	`73`	`Assert.NotNull(videos4);`
`74`	`74`	`Assert.NotEmpty(videos4);`
	`75`	`+ await videoRepository.IncrementViewCount(1);`
`75`	`76`	`}`
`76`	`77`
`77`	`78`	`[Fact(DisplayName = "Command")]`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ namespace content.domainservice;`
`7`	`7`
`8`	`8`	`public record AddVideoHistory([property: JsonNumberHandling(JsonNumberHandling.AllowReadingFromString)] long VideoId);`
`9`	`9`
`10`		`-public class HistoryService(HistoryRepository history, QdrantClient client, IDomainService domain)`
	`10`	`+public class HistoryService(HistoryRepository history, QdrantClient client, IDomainService domain,IVideoRepository video)`
`11`	`11`	`{`
`12`	`12`
`13`	`13`	`public async Task<Pagination<VideoDto>> GetHistory(long userId, long page = 0, int size = 10)`
`@@ -19,6 +19,7 @@ public async Task<Pagination<VideoDto>> GetHistory(long userId, long page = 0, i`
`19`	`19`	`public async Task<bool> AddHistory(long userId, long videoId)`
`20`	`20`	`{`
`21`	`21`	`await history.AddHistory(userId, videoId);`
	`22`	`+ await video.IncrementViewCount(videoId);`
`22`	`23`	`return true;`
`23`	`24`	`}`
`24`	`25`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public class UserRepository(HttpClient client) : IUserRepository`
`54`	`54`	`{`
`55`	`55`	`public string? Token { get; set; }`
`56`	`56`
`57`		`- /// <summary> Find user information by id. </summary>`
	`57`	`+ /// <inheritdoc />`
`58`	`58`	`public async Task<User> FindById(long id)`
`59`	`59`	`{`
`60`	`60`	`var req = new HttpRequestMessage(HttpMethod.Get, $"/users/{id}");`
`@@ -65,7 +65,7 @@ public async Task<User> FindById(long id)`
`65`	`65`	`}`
`66`	`66`
`67`	`67`
`68`		`- /// <summary> Find user information by id list. </summary>`
	`68`	`+ /// <inheritdoc />`
`69`	`69`	`public async Task<IReadOnlyList<User>> FindAllByIds(IEnumerable<long> ids)`
`70`	`70`	`{`
`71`	`71`	`var req = new HttpRequestMessage(HttpMethod.Get,`
`@@ -102,7 +102,7 @@ public class VoteRepository(HttpClient client) : IVoteRepository`
`102`	`102`	`{`
`103`	`103`	`public string? Token { get; set; }`
`104`	`104`
`105`		`- /// <summary> Get voted status of videos. </summary>`
	`105`	`+ /// <inheritdoc />`
`106`	`106`	`public async Task<IReadOnlyList<long>> VotedOfVideos(List<long> videoIds)`
`107`	`107`	`{`
`108`	`108`	`if (string.IsNullOrEmpty(Token) \|\| videoIds.Count == 0)`
`@@ -126,7 +126,7 @@ public async Task<IReadOnlyList<long>> VotedOfVideos(List<long> videoIds)`
`126`	`126`	`}`
`127`	`127`
`128`	`128`
`129`		`- /// <summary> Scan voted videos, which means paging through all voted videos. </summary>`
	`129`	`+ /// <inheritdoc />`
`130`	`130`	`public async Task<(long?, IReadOnlyList<long>)> VotedVideos(long page, int size)`
`131`	`131`	`{`
`132`	`132`	`var url = $"/graph/videos?page={page}&size={size}";`
`@@ -233,10 +233,10 @@ public static IServiceCollection AddUserRepository(this IServiceCollection servi`
`233`	`233`	`public static IApplicationBuilder UseToken(this IApplicationBuilder app) =>`
`234`	`234`	`app.Use(async (context, next) =>`
`235`	`235`	`{`
`236`		`- var userRepository = context.RequestServices.GetService<IUserRepository>();`
`237`		`- ArgumentNullException.ThrowIfNull(userRepository, nameof(userRepository));`
`238`	`236`	`var authorization = context.Request.Headers.Authorization;`
`239`	`237`
	`238`	`+ var userRepository = context.RequestServices.GetService<IUserRepository>();`
	`239`	`+ ArgumentNullException.ThrowIfNull(userRepository, nameof(userRepository));`
`240`	`240`	`userRepository.Token = authorization;`
`241`	`241`
`242`	`242`	`var voteRepository = context.RequestServices.GetService<IVoteRepository>();`