cleanup

Author: mythz

TechStacks.ServiceInterface/Html/AppScriptMethods.cs

@@ -1,13 +1,11 @@
 using System;
 using System.Collections.Generic;
-using System.Data;
 using ServiceStack;
 using ServiceStack.Auth;
 using ServiceStack.Caching;
 using ServiceStack.Data;
 using ServiceStack.OrmLite;
 using ServiceStack.Script;
-using TechStacks.ServiceModel;
 using TechStacks.ServiceModel.Types;
 
 namespace TechStacks.ServiceInterface.Html;

TechStacks.ServiceInterface/TechStackQueries.cs

@@ -10,7 +10,7 @@ namespace TechStacks.ServiceInterface;
 
 public static class TechStackQueries
 {
-    public static List<TechStackDetails> GetTechstackDetails(this IDbConnection db, SqlExpression<TechnologyStack> stackQuery)
+    public static List<TechStackDetails> GetTechStackDetails(this IDbConnection db, SqlExpression<TechnologyStack> stackQuery)
     {
         //distinct
         var latestStacks = db.Select(stackQuery)
@@ -19,7 +19,7 @@ public static List<TechStackDetails> GetTechstackDetails(this IDbConnection db,
             .ToList();
 
         if (latestStacks.Count == 0)
-            return new List<TechStackDetails>();
+            return [];
 
         var technologyChoices =
             db.LoadSelect(db.From<TechnologyChoice>()

TechStacks.ServiceInterface/TechnologyServices.cs

@@ -42,17 +42,25 @@ public object Get(GetAllTechnologies request)
 [CacheResponse(Duration = 3600)]
 public class CachedTechnologyServices(IAutoQueryDb autoQuery) : Service
 {
-    public object Any(FindTechnologies request) =>
-        autoQuery.Execute(request, autoQuery.CreateQuery(request, Request.GetRequestParams()));
+    public object Any(FindTechnologies request)
+    {
+        using var db = autoQuery.GetDb(request, base.Request);
+        var q = autoQuery.CreateQuery(request, base.Request, db);
+        return autoQuery.Execute(request, q, base.Request, db);
+    }
 
-    public object Any(QueryTechnology request) =>
-        autoQuery.Execute(request, autoQuery.CreateQuery(request, Request.GetRequestParams()));
+    public object Any(QueryTechnology request)
+    {
+        using var db = autoQuery.GetDb(request, base.Request);
+        var q = autoQuery.CreateQuery(request, base.Request, db);
+        return autoQuery.Execute(request, q, base.Request, db);
+    }
 
     public object Get(GetTechnology request)
     {
         if (string.IsNullOrEmpty(request.Slug))
             throw new ArgumentNullException(nameof(request.Slug));
-            
+
         var tech = int.TryParse(request.Slug, out var id)
             ? Db.SingleById<Technology>(id)
             : Db.Single<Technology>(x => x.Slug == request.Slug.ToLower());

TechStacks.ServiceInterface/TechnologyStackServices.cs

@@ -14,7 +14,7 @@ public class TechnologyStackServices : Service
     public object Get(GetTechnologyStackPreviousVersions request)
     {
         if (request.Slug == null)
-            throw new ArgumentNullException("Slug");
+            throw new ArgumentNullException(nameof(request.Slug));
 
         if (!long.TryParse(request.Slug, out var id))
         {
@@ -97,21 +97,19 @@ public object Any(HourlyTask request)
 }
 
 [CacheResponse(Duration = 3600)]
-public class CachedTechnologyStackServices : Service
+public class CachedTechnologyStackServices(IAutoQueryDb autoQuery) : Service
 {
-    public IAutoQueryDb AutoQuery { get; set; }
-
     //Cached AutoQuery
     public async Task<object> Any(FindTechStacks request)
     {
-        using var db = AutoQuery.GetDb(request, base.Request);
-        return await AutoQuery.ExecuteAsync(request, AutoQuery.CreateQuery(request, Request, db), db);
+        using var db = autoQuery.GetDb(request, base.Request);
+        return await autoQuery.ExecuteAsync(request, autoQuery.CreateQuery(request, Request, db), db);
     }
 
     public async Task<object> Any(QueryTechStacks request)
     {
-        using var db = AutoQuery.GetDb(request, base.Request);
-        return await AutoQuery.ExecuteAsync(request, AutoQuery.CreateQuery(request, Request, db), db);
+        using var db = autoQuery.GetDb(request, base.Request);
+        return await autoQuery.ExecuteAsync(request, autoQuery.CreateQuery(request, Request, db), db);
     }
 
     private const int TechStacksAppId = 1;
@@ -178,7 +176,7 @@ public object Any(Overview request)
         {
             Created = DateTime.UtcNow,
 
-            LatestTechStacks = Db.GetTechstackDetails(Db.From<TechnologyStack>().OrderByDescending(x => x.LastModified).Limit(20)),
+            LatestTechStacks = Db.GetTechStackDetails(Db.From<TechnologyStack>().OrderByDescending(x => x.LastModified).Limit(20)),
 
             TopUsers = Db.Select<UserInfo>(
                 @"select u.user_name as UserName, u.default_profile_url as AvatarUrl, COUNT(*) as StacksCount

TechStacks.ServiceInterface/UserFavoriteServices.cs

@@ -15,7 +15,7 @@ public object Get(GetFavoriteTechStack request)
         var session = SessionAs<CustomUserSession>();
         var favorites = Db.Select<UserFavoriteTechnologyStack>(x => x.UserId == session.UserAuthId);
         var results = favorites.Count == 0
-            ? new List<TechnologyStack>()
+            ? []
             : Db.Select(Db.From<TechnologyStack>()
                 .Where(x => Sql.In(x.Id, favorites.Select(y => y.TechnologyStackId))));
 
@@ -81,7 +81,7 @@ public object Get(GetFavoriteTechnologies request)
         var session = SessionAs<CustomUserSession>();
         var favorites = Db.Select<UserFavoriteTechnology>(x => x.UserId == session.UserAuthId).ToList();
         var results = favorites.Count == 0
-            ? new List<Technology>()
+            ? []
             : Db.Select(Db.From<Technology>()
                 .Where(x => Sql.In(x.Id, favorites.Select(y => y.TechnologyId))));
 

TechStacks.ServiceInterface/UserStackServices.cs

@@ -40,7 +40,7 @@ private List<TechStackDetails> GetDefaultFeed(List<int> favTechIds = null)
                 ts.Id == tsc.TechnologyStackId && Sql.In(tsc.TechnologyId, favTechIds));
         }
 
-        return Db.GetTechstackDetails(q);
+        return Db.GetTechStackDetails(q);
     }
 }