diff --git a/sharp/content.Tests/DomainTest.cs b/sharp/content.Tests/DomainTest.cs
index 3c6582ef..0c3413db 100644
--- a/sharp/content.Tests/DomainTest.cs
+++ b/sharp/content.Tests/DomainTest.cs
@@ -13,23 +13,22 @@
  */
 
 using content.domainservice;
-
-using JetBrains.Annotations;
 using Moq;
 using content.repository;
 
 namespace content.Tests;
-[TestSubject(typeof(DomainService))]
+
 public class DomainTest
 {
+
+    private (Mock<IVideoRepository>, Mock<IUserRepository> userRepo, Mock<IVoteRepository> voteRepo, Mock<SearchClient> searchClient) Setup() =>
+        (new Mock<IVideoRepository>(), new Mock<IUserRepository>(), new Mock<IVoteRepository>(), new Mock<SearchClient>(null!));
+
     [Fact]
     public async Task FindById_ReturnsVideoDto_WhenVideoExists()
     {
         // Arrange
-        var mockVideoRepo = new Mock<IVideoRepository>();
-        var mockUserRepo = new Mock<IUserRepository>();
-        var mockVoteRepo = new Mock<IVoteRepository>();
-        var mockSearchClient = new Mock<SearchClient>(null);
+        var (mockVideoRepo, mockUserRepo, mockVoteRepo, mockSearchClient) = Setup();
         var video = new Video { Id = 1, UserId = 1 };
         var user = new User { Id = "1" };
         mockVideoRepo.Setup(repo => repo.FindById(1)).ReturnsAsync(video);
@@ -52,10 +51,7 @@ public async Task FindById_ReturnsVideoDto_WhenVideoExists()
     public async Task FindAllByIds_ReturnsVideoDtos_WhenVideosExist()
     {
         // Arrange
-        var mockVideoRepo = new Mock<IVideoRepository>();
-        var mockUserRepo = new Mock<IUserRepository>();
-        var mockVoteRepo = new Mock<IVoteRepository>();
-        var mockSearchClient = new Mock<SearchClient>(null);
+        var (mockVideoRepo, mockUserRepo, mockVoteRepo, mockSearchClient) = Setup();
         var videos = new List<Video> { new() { Id = 1, UserId = 1 }, new() { Id = 2, UserId = 2 } };
         var users = new List<User> { new() { Id = "1" }, new() { Id = "2" } };
         mockVideoRepo.Setup(repo => repo.FindAllByIds(It.IsAny<IReadOnlyList<long>>())).ReturnsAsync(videos);
@@ -75,10 +71,7 @@ public async Task FindAllByIds_ReturnsVideoDtos_WhenVideosExist()
     public async Task Save_ReturnsSavedVideoDto_WhenVideoIsSaved()
     {
         // Arrange
-        var mockVideoRepo = new Mock<IVideoRepository>();
-        var mockUserRepo = new Mock<IUserRepository>();
-        var mockVoteRepo = new Mock<IVoteRepository>();
-        var mockSearchClient = new Mock<SearchClient>(null);
+        var (mockVideoRepo, mockUserRepo, mockVoteRepo, mockSearchClient) = Setup();
         var video = new Video { Id = 1, UserId = 1 };
         var user = new User { Id = "1" };
         mockVideoRepo.Setup(repo => repo.Save(It.IsAny<Video>())).ReturnsAsync(video);
@@ -93,10 +86,7 @@ public async Task Save_ReturnsSavedVideoDto_WhenVideoIsSaved()
     public async Task FindByUserId_ReturnsExpectedVideos()
     {
         // Arrange
-        var mockVideoRepo = new Mock<IVideoRepository>();
-        var mockUserRepo = new Mock<IUserRepository>();
-        var mockVoteRepo = new Mock<IVoteRepository>();
-        var mockSearchClient = new Mock<SearchClient>(null);
+        var (mockVideoRepo, mockUserRepo, mockVoteRepo, mockSearchClient) = Setup();
         var videos = new List<Video> { new() { Id = 1, UserId = 1 }, new() { Id = 2, UserId = 1 } };
         var user = new User { Id = "1" };
         var voteVideoIds = new List<long> { 1, 2 };
@@ -117,10 +107,7 @@ public async Task FindByUserId_ReturnsExpectedVideos()
     public async Task FindRecent_ReturnsExpectedVideos()
     {
         // Arrange
-        var mockVideoRepo = new Mock<IVideoRepository>();
-        var mockUserRepo = new Mock<IUserRepository>();
-        var mockVoteRepo = new Mock<IVoteRepository>();
-        var mockSearchClient = new Mock<SearchClient>(null);
+        var (mockVideoRepo, mockUserRepo, mockVoteRepo, mockSearchClient) = Setup();
         var videos = new List<Video> { new() { Id = 1, UserId = 1 }, new() { Id = 2, UserId = 2 } };
         var users = new List<User> { new() { Id = "1" }, new() { Id = "2" } };
         var voteVideoIds = new List<long> { 1 };
@@ -141,10 +128,7 @@ public async Task FindRecent_ReturnsExpectedVideos()
     public async Task DailyPopularVideos_ReturnsExpectedVideos()
     {
         // Arrange
-        var mockVideoRepo = new Mock<IVideoRepository>();
-        var mockUserRepo = new Mock<IUserRepository>();
-        var mockVoteRepo = new Mock<IVoteRepository>();
-        var mockSearchClient = new Mock<SearchClient>(null);
+        var (mockVideoRepo, mockUserRepo, mockVoteRepo, mockSearchClient) = Setup();
         var videos = new List<Video> { new() { Id = 1, UserId = 1 }, new() { Id = 2, UserId = 2 } };
         var users = new List<User> { new() { Id = "1" }, new() { Id = "2" } };
         var voteVideoIds = new List<long> { 1 };
@@ -167,10 +151,7 @@ public async Task DailyPopularVideos_ReturnsExpectedVideos()
     public async Task VotedVideos_ReturnsExpectedVideos()
     {
         // Arrange
-        var mockVideoRepo = new Mock<IVideoRepository>();
-        var mockUserRepo = new Mock<IUserRepository>();
-        var mockVoteRepo = new Mock<IVoteRepository>();
-        var mockSearchClient = new Mock<SearchClient>(null);
+        var (mockVideoRepo, mockUserRepo, mockVoteRepo, mockSearchClient) = Setup();
         var videoIds = new long[] { 1, 2 };
         var videos = new List<Video> { new() { Id = 1, UserId = 1 }, new() { Id = 2, UserId = 2 } };
         var users = new List<User> { new() { Id = "1" }, new() { Id = "2" } };
diff --git a/sharp/content.Tests/UnitTest.cs b/sharp/content.Tests/UnitTest.cs
index 575ae4d5..b4da5ef0 100644
--- a/sharp/content.Tests/UnitTest.cs
+++ b/sharp/content.Tests/UnitTest.cs
@@ -13,7 +13,6 @@
  */
 
 using content.repository;
-using JetBrains.Annotations;
 using Npgsql;
 using Xunit.Abstractions;
 
@@ -21,11 +20,10 @@ namespace content.Tests;
 
 public class UnitTest(ITestOutputHelper testOutputHelper)
 {
-    private readonly string _connectString = Environment.GetEnvironmentVariable("CONNECTION_STRING") !;
+    private readonly string _connectString = Environment.GetEnvironmentVariable("CONNECTION_STRING")!;
 
-    [TestSubject(typeof(VideoRepository))]
     [Fact(DisplayName = "Video Repository")]
-    public async void Test1()
+    public async Task Test1()
     {
         await using var dataSource = NpgsqlDataSource.Create(_connectString);
         var videoRepository = (IVideoRepository)new VideoRepository(dataSource);
@@ -77,7 +75,7 @@ public async void Test1()
     }
 
     [Fact(DisplayName = "Command")]
-    public async void TestInsert()
+    public async Task TestInsert()
     {
         await using var dataSource = NpgsqlDataSource.Create(_connectString);
         var videoRepository = (IVideoRepository)new VideoRepository(dataSource);
diff --git a/sharp/content.Tests/content.Tests.csproj b/sharp/content.Tests/content.Tests.csproj
index 1ab5b0f2..128fcd33 100644
--- a/sharp/content.Tests/content.Tests.csproj
+++ b/sharp/content.Tests/content.Tests.csproj
@@ -23,11 +23,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="JetBrains.Annotations" Version="2023.3.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
     <PackageReference Include="Moq" Version="4.20.70" />
-    <PackageReference Include="xunit" Version="2.4.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+    <PackageReference Include="xunit" Version="2.9.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
diff --git a/sharp/content.Tests/endpoints/EndpointsTest.cs b/sharp/content.Tests/endpoints/EndpointsTest.cs
index f8472f96..444d44ed 100644
--- a/sharp/content.Tests/endpoints/EndpointsTest.cs
+++ b/sharp/content.Tests/endpoints/EndpointsTest.cs
@@ -16,12 +16,10 @@
 using content.endpoints;
 using content.repository;
 using FluentValidation;
-using JetBrains.Annotations;
 using Moq;
 using System.Security.Claims;
 
 namespace content.Tests.endpoints;
-[TestSubject(typeof(Endpoints))]
 public class EndpointsTests
 {
     private readonly Mock<IDomainService> _mockService = new();
@@ -61,7 +59,7 @@ public async Task Videos_ReturnsExpectedVideos()
 
         Assert.Equal(expectedVideos, result);
     }
-    
+
     [Fact]
     public async Task DailyPopularVideos_ReturnsExpectedVideos()
     {
@@ -76,7 +74,7 @@ public async Task DailyPopularVideos_ReturnsExpectedVideos()
 
         Assert.Equal(expectedVideos, result);
     }
-    
+
 
     [Fact]
     public async Task Likes_ReturnsExpectedVideos()
@@ -96,7 +94,7 @@ public async Task Likes_ReturnsExpectedVideos()
 
 
     [Fact]
-    public async void CreateVideo_CallsServiceWithExpectedVideo()
+    public async Task CreateVideo_CallsServiceWithExpectedVideo()
     {
         var request = new VideoRequest
         {
@@ -149,7 +147,7 @@ public async Task Save_ReturnsCorrectDto_WhenMessageIsSaved()
             Type = 1
         };
         var expectedMessage = new MessageDto
-            { Id = 1, ReceiverId = request.ReceiverId, Content = request.Content, Type = request.Type };
+        { Id = 1, ReceiverId = request.ReceiverId, Content = request.Content, Type = request.Type };
         _mockMessageDomain.Setup(s => s.Save(It.IsAny<Message>())).ReturnsAsync(expectedMessage);
 
         // Act
diff --git a/sharp/content.Tests/repository/ProbeTest.cs b/sharp/content.Tests/repository/ProbeTest.cs
index 6afc8407..e9e6cc6e 100644
--- a/sharp/content.Tests/repository/ProbeTest.cs
+++ b/sharp/content.Tests/repository/ProbeTest.cs
@@ -12,18 +12,17 @@
  * 
  */
 using content.repository;
-using JetBrains.Annotations;
 using Xunit.Abstractions;
 
 namespace content.Tests.repository;
 
-[TestSubject(typeof(Probe))]
+
 public class ProbeTest(ITestOutputHelper testOutputHelper)
 {
     private readonly string _executablePath = Environment.GetEnvironmentVariable("FFPROBE_PATH") !;
 
     [Fact]
-    public async void Method()
+    public async Task Method()
     {
         // Arrange
         var peg = new Probe(_executablePath);
@@ -36,7 +35,7 @@ public async void Method()
     }
 
     [Fact(DisplayName = "Empty executable path")]
-    public async void EmptyExecutablePath()
+    public async Task EmptyExecutablePath()
     {
         // Arrange
         var peg = new Probe(string.Empty);
@@ -52,17 +51,17 @@ public async void EmptyExecutablePath()
     }
 
     [Fact(DisplayName = "empty url")]
-    public async void EmptyUrl()
+    public async Task EmptyUrl()
     {
         // Arrange
         var peg = new Probe(_executablePath);
         // Act && Assert
-        await Assert.ThrowsAsync<ArgumentNullException>(async () =>
+        await Assert.ThrowsAsync<ArgumentException>(async () =>
             await peg.GetVideoDuration(string.Empty));
     }
 
     [Fact(DisplayName = "resolution")]
-    public async void Resolution()
+    public async Task Resolution()
     {
         // Arrange
         var peg = new Probe(_executablePath);
@@ -75,7 +74,7 @@ public async void Resolution()
     }
     
     [Fact(DisplayName = "not a video")]
-    public async void NotAVideo()
+    public async Task NotAVideo()
     {
         // Arrange
         var peg = new Probe(_executablePath);
diff --git a/sharp/content.Tests/repository/UserRepositoryTest.cs b/sharp/content.Tests/repository/UserRepositoryTest.cs
index 7209e615..b00aff3c 100644
--- a/sharp/content.Tests/repository/UserRepositoryTest.cs
+++ b/sharp/content.Tests/repository/UserRepositoryTest.cs
@@ -9,48 +9,72 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- * 
+ *
  */
+
+using System.Net;
+using System.Net.Http.Json;
+using System.Text.Json.Serialization;
 using content.repository;
-using Grpc.Core;
-using Grpc.Net.Client;
-using JetBrains.Annotations;
+using Moq;
+using Moq.Protected;
 
 namespace content.Tests.repository;
 
-[TestSubject(typeof(UserRepository))]
 public class UserRepositoryTest
 {
-    
-    private readonly ChannelBase _channel = GrpcChannel.ForAddress(Environment.GetEnvironmentVariable("USER_STRING") !);
-
     [Fact(DisplayName = "FindUserById")]
-    public async void Test1()
-    {
-        var client = new UserRepository(_channel);
-        var result = await client.FindById(1);
-        
-        Assert.NotNull(result);
-        Assert.Equal("1", result.Id);
-    }
-    
-    [Fact(DisplayName = "FindUserByIds")]
-    public async void Test2()
+    public async Task Test1()
     {
+        // Arange
+        var id = 1L;
+        var user = new User { Id = id.ToString(), Name = "test", AvatarUrl = "https://example.com/avatar.png", BgUrl = "https://example.com/bg.png", Bio = "test user", };
+        var mockHttpMessageHandler = new Mock<HttpMessageHandler>();
+        mockHttpMessageHandler.Protected()
+            .Setup<Task<HttpResponseMessage>>("SendAsync", ItExpr.IsAny<HttpRequestMessage>(), ItExpr.IsAny<CancellationToken>())
+            .ReturnsAsync(new HttpResponseMessage { StatusCode = HttpStatusCode.OK, Content = JsonContent.Create(user, UserJsonContext.Default.User), });
+        var httpClient = new HttpClient(mockHttpMessageHandler.Object) { BaseAddress = new Uri("http://localhost:5151") };
+        var client = new UserRepository(httpClient);
+        // Act
+        var result = await client.FindById(id);
 
-        var client = new UserRepository(_channel);
-        var result = await client.FindAllByIds(new []{1L, 2L});
+        // Assert
         Assert.NotNull(result);
-        Assert.Equal(2, result.Count);
+        Assert.Equal(id.ToString(), result.Id);
+        Assert.Equal("test", result.Name);
+        Assert.Equal("https://example.com/avatar.png", result.AvatarUrl);
+        Assert.Equal("https://example.com/bg.png", result.BgUrl);
+        Assert.Equal("test user", result.Bio);
     }
-    
-    [Fact(DisplayName = "invalid token, error")]
-    public async void Test3()
+
+    [Fact(DisplayName = "FindUserByIds")]
+    public async Task Test2()
     {
-        var client = new UserRepository(_channel)
+        // Arange
+        var ids = new List<long> { 1L, 2L };
+        var users = new List<User>
         {
-            Token = "token"
+            new() {Id = "1",Name = "test1",AvatarUrl = "https://example.com/avatar1.png",BgUrl = "https://example.com/bg1.png",Bio = "test user1"},
+            new(){Id = "2",Name = "test2",AvatarUrl = "https://example.com/avatar2.png",BgUrl = "https://example.com/bg2.png",Bio = "test user2"}
         };
-        await Assert.ThrowsAsync<RpcException>(async () => await client.FindAllByIds(new []{493764627922944111, 11}));
+        var mockHttpMessageHandler = new Mock<HttpMessageHandler>();
+        mockHttpMessageHandler.Protected().Setup<Task<HttpResponseMessage>>("SendAsync", ItExpr.IsAny<HttpRequestMessage>(), ItExpr.IsAny<CancellationToken>())
+            .ReturnsAsync(new HttpResponseMessage { StatusCode = HttpStatusCode.OK, Content = JsonContent.Create(users, UserJsonContext.Default.IReadOnlyListUser) });
+        var httpClient = new HttpClient(mockHttpMessageHandler.Object) { BaseAddress = new Uri("http://localhost:5151") };
+        var client = new UserRepository(httpClient);
+        // Act
+        var result = await client.FindAllByIds(ids);
+        // Assert
+        Assert.NotNull(result);
+        Assert.Equal(2, result.Count);
+        Assert.Equal("1", result[0].Id);
+        Assert.Equal("https://example.com/avatar1.png", result[0].AvatarUrl);
+        Assert.Equal("test user1", result[0].Bio);
+        Assert.Equal("2", result[1].Id);
+        Assert.Equal("https://example.com/bg2.png", result[1].BgUrl);
     }
-}
\ No newline at end of file
+}
+
+[JsonSourceGenerationOptions(PropertyNamingPolicy = JsonKnownNamingPolicy.SnakeCaseLower)]
+[JsonSerializable(typeof(IReadOnlyList<User>))]
+partial class UserJsonContext : JsonSerializerContext;
\ No newline at end of file
diff --git a/sharp/content/Dockerfile b/sharp/content/Dockerfile
index d5e49108..da476a44 100644
--- a/sharp/content/Dockerfile
+++ b/sharp/content/Dockerfile
@@ -17,7 +17,7 @@ RUN adduser -u 1000 --gecos "" --disabled-password appuser && chown -R appuser /
 USER appuser
 EXPOSE 5000
 
-FROM mcr.microsoft.com/dotnet/sdk:9.0.100-preview.7-alpine3.20 AS build
+FROM mcr.microsoft.com/dotnet/sdk:9.0.100-alpine3.20 AS build
 RUN apk update && apk upgrade && apk add --no-cache clang build-base zlib-dev grpc-plugins
 WORKDIR /src
 ARG RUNTIME_ID=linux-musl-x64
diff --git a/sharp/content/Program.cs b/sharp/content/Program.cs
index a6d84a04..465b4462 100644
--- a/sharp/content/Program.cs
+++ b/sharp/content/Program.cs
@@ -54,7 +54,6 @@
         .AddSource(serviceName).AddNpgsql()
         .SetResourceBuilder(ResourceBuilder.CreateDefault().AddService(serviceName: serviceName))
         .AddHttpClientInstrumentation()
-        .AddGrpcClientInstrumentation()
         .AddAspNetCoreInstrumentation()
         .AddOtlpExporter(o =>
         {
@@ -66,7 +65,7 @@
 }).WithMetrics(mtb =>
 {
     mtb
-        .AddMeter("Microsoft.AspNetCore.Hosting", "Microsoft.AspNetCore.Server.Kestrel", "Npgsql")
+        .AddMeter("Npgsql")
         .AddAspNetCoreInstrumentation()
         .AddHttpClientInstrumentation()
         .AddPrometheusExporter();
@@ -78,16 +77,15 @@
 builder.Services.AddAuthorization().AddProbe();
 builder.Services.AddProblemDetails().AddResponseCompression();
 
-builder.Services.AddNpgsqlDataSource(builder.Configuration.GetConnectionString("Default") ??
-                                    throw new InvalidOperationException("Connection string is null"));
+builder.Services.AddNpgsqlDataSource(builder.Configuration.GetConnectionString("Default").EnsureNotNull("Connection string is null"));
+
 builder.Services.AddVideoRepository().AddNotificationRepository();
 
-builder.Services.AddGrpcUser().AddUserRepository();
+builder.Services.AddUserRepository();
 
-builder.Services.AddVoteRepository(builder.Configuration.GetConnectionString("Vote") ?? throw new InvalidOperationException("Vote connection string is null"));
+builder.Services.AddVoteRepository();
 
-builder.Services.AddSearchClient(builder.Configuration.GetConnectionString("Search") ?? throw new InvalidOperationException("Search connection string is null"),
-    builder.Configuration["Token"] ?? throw new InvalidOperationException("Token is null"));
+builder.Services.AddSearchClient();
 
 builder.Services.AddDomainService().AddMessageDomain();
 
diff --git a/sharp/content/Protos/user.proto b/sharp/content/Protos/user.proto
deleted file mode 100644
index 18822290..00000000
--- a/sharp/content/Protos/user.proto
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2023-2024 sixwaaaay.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *     http://www.apache.org/licenses/LICENSE-2.
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- */
-syntax = "proto3";
-
-option csharp_namespace = "GrpcUser";
-
-package sixwaaaay.user;
-
-message User {
-  int64 id = 1;
-  string name = 2;
-  bool is_follow = 5;
-  string avatar_url = 6;
-  string bg_url = 7;
-  string bio = 8;
-  int32 likes_given = 9;
-  int32 likes_received = 10;
-  int32 videos_posted = 11;
-  int32 following = 12;
-  int32 followers = 13;
-}
-
-message GetUserRequest {
-  int64 user_id = 1;
-}
-
-message GetUserReply {
-  User user = 1;
-}
-
-message GetUsersRequest {
-  repeated int64 user_ids = 1;
-}
-
-message GetUsersReply {
-  repeated User users = 1;
-}
-
-service UserService {
-  rpc GetUser(GetUserRequest) returns (GetUserReply);
-  rpc GetUsers(GetUsersRequest) returns (GetUsersReply);
-}
\ No newline at end of file
diff --git a/sharp/content/content.csproj b/sharp/content/content.csproj
index 7547978e..315cbf77 100644
--- a/sharp/content/content.csproj
+++ b/sharp/content/content.csproj
@@ -28,33 +28,22 @@
   <ItemGroup>
     <PackageReference Include="Dapper" Version="2.1.24" />
     <PackageReference Include="Dapper.AOT" Version="1.0.31" />
-    <PackageReference Include="Google.Protobuf" Version="3.27.3" />
-    <PackageReference Include="Grpc.Net.Client" Version="2.59.0" />
-    <PackageReference Include="Grpc.Tools" Version="2.60.0">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.1" />
-    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.0-preview.7.24406.2" />
-    <PackageReference Include="Microsoft.Extensions.ApiDescription.Server" Version="9.0.0-preview.7.24406.2">
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.ApiDescription.Server" Version="9.0.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="npgsql" Version="8.0.5" />
     <PackageReference Include="Npgsql.DependencyInjection" Version="8.0.5" />
     <PackageReference Include="Npgsql.OpenTelemetry" Version="8.0.5" />
-    <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.7.0" />
-    <PackageReference Include="OpenTelemetry.Exporter.Prometheus.AspNetCore" Version="1.7.0-rc.1" />
-    <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.7.0" />
-    <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.7.0" />
-    <PackageReference Include="OpenTelemetry.Instrumentation.GrpcNetClient" Version="1.6.0-beta.3" />
-    <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.7.0" />
-    <PackageReference Include="Riok.Mapperly" Version="3.6.0" />
-    <PackageReference Include="FluentValidation" Version="11.9.2" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Protobuf Include="Protos\user.proto" GrpcServices="Client" />
+    <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.10.0" />
+    <PackageReference Include="OpenTelemetry.Exporter.Prometheus.AspNetCore" Version="1.10.0-beta.1" />
+    <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.10.0" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.9.0" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.9.0" />
+    <PackageReference Include="Riok.Mapperly" Version="4.1.0" />
+    <PackageReference Include="FluentValidation" Version="11.10.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/sharp/content/repository/Client.cs b/sharp/content/repository/Client.cs
index 16f7144e..9fdc0041 100644
--- a/sharp/content/repository/Client.cs
+++ b/sharp/content/repository/Client.cs
@@ -15,10 +15,6 @@
 using System.Net.Http.Headers;
 using System.Security.Claims;
 using System.Text.Json.Serialization;
-using Grpc.Core;
-using Grpc.Core.Interceptors;
-using Grpc.Net.Client;
-using Riok.Mapperly.Abstractions;
 
 namespace content.repository;
 
@@ -37,14 +33,6 @@ public class User
     public int Followers { get; init; }
 }
 
-[Mapper]
-public static partial class UserExtension
-{
-    public static partial User ProtoToUser(this GrpcUser.User user);
-
-    public static partial IReadOnlyList<User> ProtoToUser(this IReadOnlyList<GrpcUser.User> users);
-}
-
 public interface IUserRepository
 {
     string? Token { get; set; }
@@ -53,54 +41,42 @@ public interface IUserRepository
     /// <param name="id"> User id. </param>
     /// <returns> User information. </returns>
     Task<User> FindById(long id);
+
     /// <summary> Find user information by id list. </summary>
     /// <param name="ids"> User id list. </param>
     /// <returns> User information list. </returns>
     Task<IReadOnlyList<User>> FindAllByIds(IEnumerable<long> ids);
 }
 
-public class UserRepository : IUserRepository
+public class UserRepository(HttpClient client) : IUserRepository
 {
-    private readonly GrpcUser.UserService.UserServiceClient _client;
-
-    public UserRepository(ChannelBase channel)
-    {
-        _client = new GrpcUser.UserService.UserServiceClient(channel.Intercept(Func));
-    }
-
-    private Metadata Func(Metadata metadata)
-    {
-        if (!string.IsNullOrEmpty(Token))
-        {
-            metadata.Add("Authorization", Token);
-        }
-
-        return metadata;
-    }
-
     public string? Token { get; set; }
 
     public async Task<User> FindById(long id)
     {
-        var request = new GrpcUser.GetUserRequest()
-        {
-            UserId = id
-        };
-        var reply = await _client.GetUserAsync(request);
-        return reply.User.ProtoToUser();
+        var req = new HttpRequestMessage(HttpMethod.Get, $"/users/{id}");
+        req.Headers.Authorization = new AuthenticationHeaderValue("Bearer", Token);
+        Console.WriteLine(client.BaseAddress);
+        var resp = await client.SendAsync(req);
+        resp.EnsureSuccessStatusCode();
+        return await resp.Content.ReadFromJsonAsync(UserJsonContext.Default.User) ?? new();
     }
 
     public async Task<IReadOnlyList<User>> FindAllByIds(IEnumerable<long> ids)
     {
-        var request = new GrpcUser.GetUsersRequest()
-        {
-            UserIds = { ids.Distinct() }
-        };
-        var reply = await _client.GetUsersAsync(request);
-        return reply.Users.ProtoToUser();
+        var req = new HttpRequestMessage(HttpMethod.Get,
+            $"/users?{string.Join("&", ids.Distinct().Select(id => $"ids={id}"))}");
+        req.Headers.Authorization = new AuthenticationHeaderValue("Bearer", Token);
+        var resp = await client.SendAsync(req);
+        resp.EnsureSuccessStatusCode();
+        return await resp.Content.ReadFromJsonAsync(UserJsonContext.Default.IReadOnlyListUser) ?? [];
     }
 }
 
+[JsonSourceGenerationOptions(PropertyNamingPolicy = JsonKnownNamingPolicy.SnakeCaseLower)]
+[JsonSerializable(typeof(IReadOnlyList<User>))]
+public partial class UserJsonContext : JsonSerializerContext;
+
 public interface IVoteRepository
 {
     string? Token { get; set; }
@@ -112,7 +88,6 @@ public interface IVoteRepository
 
 
     /// <summary> Scan voted videos, which means paging through all voted videos. </summary>
-    /// <param name="userId"> User id. </param>
     /// <param name="page"> Page token. </param>
     /// <param name="size"> Page size. </param>
     /// <returns> Page token and voted videos. </returns>    
@@ -147,7 +122,6 @@ public async Task<IReadOnlyList<long>> VotedOfVideos(List<long> videoIds)
 
     public async Task<(long?, IReadOnlyList<long>)> VotedVideos(long page, int size)
     {
-
         using var req = new HttpRequestMessage(HttpMethod.Get, $"/graph/videos?page={page}&size={size}");
         if (!string.IsNullOrEmpty(Token) && AuthenticationHeaderValue.TryParse(Token, out var auth))
         {
@@ -178,7 +152,6 @@ internal partial class VoteJsonContext : JsonSerializerContext;
 
 public class SearchClient(IHttpClientFactory clientFactory)
 {
-
     public async Task<IReadOnlyList<long>> SimilarSearch(long videoId)
     {
         using var client = clientFactory.CreateClient("Search");
@@ -192,17 +165,16 @@ public async Task<IReadOnlyList<long>> SimilarSearch(long videoId)
 
         return result.Hits.Select(h => h.Id).ToList();
     }
-
 }
+
 public record RequestBody(
     [property: JsonPropertyName("id")] long Id,
-    [property: JsonPropertyName("attributesToRetrieve")] string[] AttributesToRetrieve
-);
+    [property: JsonPropertyName("attributesToRetrieve")] string[] AttributesToRetrieve,
+    [property: JsonPropertyName("limit")] int Limit = 10);
 
-public record Response
+public record Response()
 {
-    [JsonPropertyName("hits")]
-    public IReadOnlyList<SimilarVideo> Hits { get; init; } = [];
+    [JsonPropertyName("hits")] public IReadOnlyList<SimilarVideo> Hits { get; init; } = [];
 }
 
 public record SimilarVideo([property: JsonPropertyName("id")] long Id);
@@ -213,30 +185,29 @@ public partial class SearchContext : JsonSerializerContext;
 
 public static class Extension
 {
-    public static IServiceCollection AddVoteRepository(this IServiceCollection services, string baseAddress)
-    {
-        services.AddScoped<IVoteRepository, VoteRepository>(
-            sp => new VoteRepository(sp.GetRequiredService<IHttpClientFactory>().CreateClient("Vote")))
-        .AddHttpClient("Vote", client => client.BaseAddress = new Uri(baseAddress.TrimEnd('/')));
-        return services;
-    }
-
-    public static IServiceCollection AddSearchClient(this IServiceCollection services, string baseAddress, string token)
-    {
-        services.AddScoped<SearchClient>().AddHttpClient("Search", client => {
+    public static IServiceCollection AddVoteRepository(this IServiceCollection services) => services
+        .AddScoped<IVoteRepository, VoteRepository>(sp =>
+            new VoteRepository(sp.GetRequiredService<IHttpClientFactory>().CreateClient("Vote")))
+        .AddHttpClient("Vote",
+            (sp, client) => client.BaseAddress = new Uri(sp.GetRequiredService<IConfiguration>()
+                .GetConnectionString("Vote").EnsureNotNull("Vote connection string is null").TrimEnd('/'))).Services;
+
+    public static IServiceCollection AddSearchClient(this IServiceCollection services) => services
+        .AddScoped<SearchClient>().AddHttpClient("Search", (sp, client) =>
+        {
+            var baseAddress = sp.GetRequiredService<IConfiguration>().GetConnectionString("Search")
+                .EnsureNotNull("Search connection string is null");
+            var token = sp.GetRequiredService<IConfiguration>().GetConnectionString("Token");
             client.BaseAddress = new Uri(baseAddress.TrimEnd('/'));
             client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token);
-        });
-        return services;
-    }
+        }).Services;
 
     public static IServiceCollection AddUserRepository(this IServiceCollection services) =>
-        services.AddScoped<IUserRepository, UserRepository>();
-
-    public static IServiceCollection AddGrpcUser(this IServiceCollection services) =>
-        services.AddSingleton<ChannelBase>(sp => GrpcChannel.ForAddress(
-            sp.GetRequiredService<IConfiguration>().GetConnectionString("User") ??
-            throw new InvalidOperationException(@"User connection string is null.")));
+        services.AddScoped<IUserRepository, UserRepository>(
+            sp => new UserRepository(sp.GetRequiredService<IHttpClientFactory>().CreateClient("User"))
+        ).AddHttpClient("User",
+            (sp, client) => client.BaseAddress = new Uri(sp.GetRequiredService<IConfiguration>()
+                .GetConnectionString("User").EnsureNotNull("User connection string is null").TrimEnd('/'))).Services;
 
     public static IApplicationBuilder UseToken(this IApplicationBuilder app) =>
         app.Use(async (context, next) =>
@@ -259,4 +230,11 @@ public static long UserId(this ClaimsPrincipal user)
         var id = user.Claims.FirstOrDefault(c => c.Type == "id")?.Value;
         return id == null ? 0 : long.Parse(id);
     }
+
+    public static string EnsureNotNull(this string? value, string msg)
+    {
+        if (string.IsNullOrEmpty(value))
+            throw new InvalidOperationException(msg);
+        return value;
+    }
 }
\ No newline at end of file
diff --git a/sharp/content/repository/Content.cs b/sharp/content/repository/Content.cs
index fd576036..0e90a957 100644
--- a/sharp/content/repository/Content.cs
+++ b/sharp/content/repository/Content.cs
@@ -122,19 +122,19 @@ internal class RankedVideo
     /// <returns> A tuple of the next page token and the list of videos. </returns>
     public async Task<(long, IReadOnlyList<Video>)> DailyPopularVideos(long page, int size)
     {
-        IEnumerable<RankedVideo> ranks;
-        await using (var connection = await dataSource.OpenConnectionAsync())
-        {
-            ranks = await connection.QueryAsync<RankedVideo>(
-                "SELECT id, order_num FROM popular_videos WHERE order_num > @page ORDER BY order_num DESC LIMIT @size",
-                new { page, size });
-        }
-
+        var ranks = await queryRanks(page, size);
         var rankedVideos = ranks.ToList();
         var nextToken = rankedVideos.Count == size ? rankedVideos[^1].OrderNum : 0;
         var ids = rankedVideos.Select(r => r.Id).ToArray();
         var videos = await FindAllByIds(ids);
         return (nextToken, videos);
+        async ValueTask<IEnumerable<RankedVideo>> queryRanks(long page, int size)
+        {
+            await using var connection = await dataSource.OpenConnectionAsync();
+            return await connection.QueryAsync<RankedVideo>(
+                "SELECT id, order_num FROM popular_videos WHERE order_num > @page ORDER BY order_num DESC LIMIT @size",
+                new { page, size });
+        }
     }
 
     /// <summary> Save the video. </summary>
diff --git a/sharp/content/repository/Probe.cs b/sharp/content/repository/Probe.cs
index 97d83b50..3b1df560 100644
--- a/sharp/content/repository/Probe.cs
+++ b/sharp/content/repository/Probe.cs
@@ -17,40 +17,26 @@ namespace content.repository;
 
 public interface IProbe
 {
-    /// <summary>
-    ///  get the resolution of video from given url
-    /// </summary>
-    /// <param name="url">
-    ///  video url
-    /// </param>
-    /// <returns>
-    ///  resolution of video
-    /// </returns>
+    /// <summary> get the resolution of video from given url </summary>
+    /// <param name="url"> video url </param>
+    /// <returns> resolution of video </returns>
     public Task<string> GetVideoResolution(string url);
 
-    /// <summary>
-    /// get the duration of video from given url
-    /// </summary>
-    /// <param name="url">
-    /// video url
-    /// </param>
-    /// <returns>
-    /// duration of video
-    /// </returns>
+    /// <summary> get the duration of video from given url </summary>
+    /// <param name="url"> video url </param>
+    /// <returns> duration of video </returns>
     public Task<string> GetVideoDuration(string url);
 }
 
 /// <summary>
 ///  use ffprobe to get video info
 /// </summary>
-/// <param name="executablePath">
-/// ffprobe executable path
-/// </param>
+/// <param name="executablePath"> ffprobe executable path </param>
 public class Probe(string executablePath) : IProbe
 {
     public async Task<string> GetVideoResolution(string url)
     {
-        EnsureUrlExists(url);
+        ArgumentException.ThrowIfNullOrEmpty(url); /* ensure  url is not null or empty */
         if (string.IsNullOrEmpty(executablePath))
         {
             return string.Empty;
@@ -80,7 +66,7 @@ private async Task<string> Process(string arguments)
 
     public async Task<string> GetVideoDuration(string url)
     {
-        EnsureUrlExists(url);
+        ArgumentException.ThrowIfNullOrEmpty(url); /* ensure  url is not null or empty */
 
         if (string.IsNullOrWhiteSpace(executablePath))
         {
@@ -89,14 +75,6 @@ public async Task<string> GetVideoDuration(string url)
 
         return await Process($"-v error -show_entries format=duration -of default=noprint_wrappers=1:nokey=1 {url}");
     }
-
-    private static void EnsureUrlExists(string url)
-    {
-        if (string.IsNullOrEmpty(url))
-        {
-            throw new ArgumentNullException(nameof(url));
-        }
-    }
 }
 
 public static class ProbeExtensions