Merge branch 'main' into UmarqulovMuhammd

Author: theyasub

Tigernet.Samples.RestApi/Clevers/Interfaces/IUserClever.cs

@@ -7,4 +7,5 @@ public interface IUserClever : ICleverBase<User, int>
 {
     User Add(User user);
     User Update(int userId, User user);
+    bool Delete(int userId);
 }

Tigernet.Samples.RestApi/Clevers/UserClever.cs

@@ -43,7 +43,7 @@ public class UserClever : CleverBase<User, int>, IUserClever
                 Id = 6,
                 Name = "Sabohat",
                 Age = 23
-            },
+            }
         };
 
         public UserClever() : base(users.AsQueryable())
@@ -56,6 +56,7 @@ public User Add(User user)
 
             return user;
         }
+        
 
         public User Update(int userId, User user)
         {
@@ -68,5 +69,19 @@ public User Update(int userId, User user)
 
             return existedUser;
         }
+
+        public bool Delete(int userId)
+        {
+            var userToDelete = users.FirstOrDefault(u => u.Id == userId);
+            if (userToDelete != null)
+            {
+                users.Remove(userToDelete);
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+        }
     }
 }

Tigernet.Samples.RestApi/Models/User.cs

@@ -6,10 +6,10 @@ namespace Tigernet.Samples.RestApi.Models
     public class User : IEntity<int>, IQueryableEntity
     {
         public int Id { get; set; }
-        
+
         [SearchableProperty]
         public string Name { get; set; }
-        
+
         public int Age { get; set; }
     }
 }

Tigernet.Samples.RestApi/Program.cs

@@ -2,7 +2,7 @@
 using Tigernet.Samples.RestApi.Clevers;
 using Tigernet.Samples.RestApi.Clevers.Interfaces;
 
-var builder = new TigernetHostBuilder("http://localhost:5000/");
+var builder = new TigernetHostBuilder();
 
 builder.AddService<IUserClever, UserClever>();
 

Tigernet.Samples.RestApi/Properties/launchSettings.json

@@ -0,0 +1,3 @@
+{
+  "applicationUrl": "http://localhost:5000/" 
+}

Tigernet.Samples.RestApi/Resters/UsersRester.cs

@@ -28,6 +28,7 @@ public async ValueTask<object> GetByFilter(EntityQueryOptions<User> model)
         public async ValueTask<object> Get([FromBody] int id)
         {
             var result = await userClever.GetByIdAsync(id);
+
             return Ok(result);
         }
 
@@ -46,8 +47,15 @@ public object Put()
                 Name = "Ali",
                 Age = 28
             };
-            
+
             return Ok(userClever.Update(user.Id, user));
         }
+
+        [Deleter("/delete")]
+        public object Delete(int userUd)
+        {
+            var res = userClever.Delete(7);
+            return Ok(res);
+        }
     }
 }

docs/GeneratingQueryOptions.md

@@ -1,4 +1,4 @@
-# Generating query options can be made easy by utilizing extension methods that provide a range of features for querying. These methods include: `1.2`
+# Generating query options can be made easily by utilizing extension methods that provide a range of features for querying. These methods include: `1.2`
 
 - CreateQuery: creates a new query object for the specified entity type.
 - AddFilter: filters data based on specific criteria, such as location or ID.

src/Tigernet.Hosting/Attributes/HttpMethods/DeleterAttribute.cs

@@ -0,0 +1,23 @@
+
+
+namespace Tigernet.Hosting.Attributes.HttpMethods
+{
+    /// <summary>
+    /// The 'DeleterAttribute' class used to represent a DELETE HTTP method.
+    /// </summary>
+    public class DeleterAttribute : HttpMethodAttribute
+    {
+        /// <inheritdoc />
+        public DeleterAttribute(string route = null)
+            : base(route)
+        {
+            
+        }
+        
+        /// <inheritdoc />
+        internal override string HttpMethodName
+        {
+            get => "DELETE";
+        }
+    }
+}

src/Tigernet.Hosting/Attributes/HttpMethods/PosterAttribute.cs

@@ -6,13 +6,14 @@
 public class PosterAttribute : HttpMethodAttribute
 {
     /// <inheritdoc />
-	public PosterAttribute(string route = null)
+    public PosterAttribute(string route = null)
         : base(route)
     {
-
     }
 
     /// <inheritdoc/>
-    internal override string HttpMethodName { get => "POST"; }
-
-}
+    internal override string HttpMethodName
+    {
+        get => "POST";
+    }
+}

src/Tigernet.Hosting/Exceptions/ArgumentNullException.cs

@@ -6,5 +6,5 @@ public ArgumentNullException(string argumentName)
         : base($"The argument '{argumentName}' cannot be null, please provide a valid input!")
     {
     }
-
+    
 }

src/Tigernet.Hosting/Extensions/QueryExtensions.cs

@@ -1,5 +1,5 @@
-using System.Linq.Expressions;
-using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore;
+using System.Linq.Expressions;
 using Tigernet.Hosting.Models.Common;
 using Tigernet.Hosting.Models.Query;
 

src/Tigernet.Hosting/Models/Common/IQueryableEntity.cs

@@ -1,6 +1,4 @@
-using Tigernet.Hosting.Models.Query;
-
-namespace Tigernet.Hosting.Models.Common
+namespace Tigernet.Hosting.Models.Common
 {
     /// <summary>
     /// Defines queryable entity

src/Tigernet.Hosting/Models/Query/FilterOptions.cs

@@ -1,6 +1,4 @@
-using Tigernet.Hosting.Models.Query;
-
-namespace Tigernet.Hosting.Models.Query;
+namespace Tigernet.Hosting.Models.Query;
 
 /// <summary>
 /// Represents filtering options

src/Tigernet.Hosting/Models/Query/IQueryOptions.cs

@@ -1,6 +1,4 @@
-using Tigernet.Hosting.Models.Query;
-
-namespace Tigernet.Hosting.Models.Query;
+namespace Tigernet.Hosting.Models.Query;
 
 /// <summary>
 /// Defines properties for queryable source query options

src/Tigernet.Hosting/Models/Query/QueryOptions.cs

@@ -1,6 +1,4 @@
-using Tigernet.Hosting.Models.Query;
-
-namespace Tigernet.Hosting.Models.Query;
+namespace Tigernet.Hosting.Models.Query;
 
 /// <summary>
 /// Represents queryable source query options

src/Tigernet.Hosting/Program.cs

@@ -1,7 +1,7 @@
 using System.Text;
 using Tigernet.Hosting;
 
-TigernetHostBuilder host = new TigernetHostBuilder("http://localhost:5001/");
+TigernetHostBuilder host = new TigernetHostBuilder();
 
 // add route to the host
 host.MapRoute("/", async context =>

src/Tigernet.Hosting/TigernetHostBuilder.cs

@@ -1,18 +1,17 @@
+using Newtonsoft.Json;
 using System.Data;
 using System.Net;
 using System.Reflection;
 using System.Text;
-using System.Text.Json.Serialization;
-using Newtonsoft.Json;
+using System.Text.Json;
 using Tigernet.Hosting.Attributes.HttpMethods;
 using Tigernet.Hosting.Attributes.RequestContents;
 using Tigernet.Hosting.Attributes.Resters;
 using Tigernet.Hosting.Exceptions;
-using Tigernet.Hosting.Extensions;
 using JsonConverter = System.Text.Json.Serialization.JsonConverter;
 using JsonSerializer = System.Text.Json.JsonSerializer;
 
-namespace Tigernet.Hosting; 
+namespace Tigernet.Hosting;
 
 #pragma warning disable
 /// <summary>
@@ -49,10 +48,10 @@ public partial class TigernetHostBuilder
     /// Constructor for TigernetHostBuilder class. It takes in a string prefix and sets it as the prefix for the HttpListener.
     /// </summary>
     /// <param name="prefix">The prefix for the HttpListener</param>
-    public TigernetHostBuilder(string prefix)
+    public TigernetHostBuilder()
     {
-        _prefix = prefix;
-        _listener.Prefixes.Add(prefix);
+        _prefix = GetPrefix();
+        _listener.Prefixes.Add(_prefix);
         _services = new Dictionary<Type, Type>();
     }
 
@@ -168,10 +167,11 @@ public void MapResters()
                 var posterAttr = method.GetCustomAttribute<PosterAttribute>();
                 var patcherAttr = method.GetCustomAttribute<PatcherAttribute>();
                 var putterAttr = method.GetCustomAttribute<PutterAttribute>();
+                var deleterAttr = method.GetCustomAttribute<DeleterAttribute>();
 
                 HttpMethodAttribute? endpointAttr = GetValidatedMethodAttributes(new HttpMethodAttribute[]
                 {
-                    getterAttr, posterAttr, patcherAttr, putterAttr
+                    getterAttr, posterAttr, patcherAttr, putterAttr, deleterAttr
                 });
 
                 var route = Path.Combine("/", typeName.Split(new[] { "Rester" },
@@ -185,7 +185,7 @@ public void MapResters()
             }
         }
     }
-    
+
     /// <summary>
     /// Retrieves a validated HttpMethodAttribute from an array of HttpMethodAttributes.
     /// </summary>
@@ -330,4 +330,25 @@ private async ValueTask<object[]> GetArguments(MethodInfo method, HttpListenerCo
 
         return result;
     }
+
+    private string GetPrefix()
+    {
+        // get the assembly that is using this library
+        var assembly = Assembly.GetCallingAssembly();
+
+        // Set the path of the file within the project
+        string filePath = @"../../../Properties/launchSettings.json";
+
+        // Read the contents of the file
+        string launchSettingsJson = File.ReadAllText(filePath);
+
+        // Parse the JSON string into a JsonDocument object
+        JsonDocument launchSettingsDoc = JsonDocument.Parse(launchSettingsJson);
+
+        // Navigate the JSON object to get the desired value
+        JsonElement applicationUrlElement = launchSettingsDoc.RootElement
+            .GetProperty("applicationUrl");
+
+        return applicationUrlElement.GetString();
+    }
 }