Merge pull request #4 from DuckTieCorpMember/25.1.3+

Convert orig and fix examples

Author: DuckTieCorpMember

ASP.NET Core/ASP.NET Core.csproj

@@ -20,7 +20,8 @@
   </Target>
 
   <ItemGroup>
-    <PackageReference Include="DevExtreme.AspNet.Core" Version="25.1.*" />
+    <PackageReference Include="DevExtreme.AspNet.Core" Version="25.1.3" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
   </ItemGroup>
 
 </Project>

ASP.NET Core/Controllers/SampleDataController.cs

@@ -3,58 +3,75 @@
 using System.Linq;
 using System.Net;
 using System.Net.Http;
+using ASP.NET_Core.Models;
 using ASP_NET_Core.Models;
 using DevExtreme.AspNet.Data;
 using DevExtreme.AspNet.Mvc;
 using Microsoft.AspNetCore.Mvc;
-using System.Text.Json;
+using Newtonsoft.Json;
 
 namespace ASP_NET_Core.Controllers;
 
+[Route("api/[controller]/[action]")]
 [Route("api/[controller]/[action]")]
 public class SampleDataController: Controller {
-
     [HttpGet]
-    public object Get(DataSourceLoadOptions loadOptions) {
-        return DataSourceLoader.Load(SampleData.Orders, loadOptions);
+    public object GetStudents(DataSourceLoadOptions loadOptions) {
+        return DataSourceLoader.Load(SampleData.Students, loadOptions);
     }
 
     [HttpGet]
-    public object GetStudents(DataSourceLoadOptions loadOptions)
-    {
-        return DataSourceLoader.Load(SampleData.Students, loadOptions);
+    public object GetStudentSubjects(DataSourceLoadOptions loadOptions) {
+        return DataSourceLoader.Load(SampleData.StudentSubjects, loadOptions);
     }
 
     [HttpPost]
-    public IActionResult InsertStudent(string values)
-    {
-        var newStudent = JsonSerializer.Deserialize<Student>(values, new JsonSerializerOptions { PropertyNameCaseInsensitive = true });
-        if (newStudent == null) return BadRequest();
+    public IActionResult InsertStudent(string values) {
+        var newStudent = new Student();
+        JsonConvert.PopulateObject(values, newStudent);
 
         newStudent.ID = SampleData.Students.Count() + 1;
         SampleData.Students.Add(newStudent);
 
         return Ok(newStudent);
     }
 
+    [HttpPost]
+    public IActionResult InsertStudentSubject(string values) {
+        var newStudentSubject = new StudentSubject();
+        JsonConvert.PopulateObject(values, newStudentSubject);
+
+        newStudentSubject.ID = SampleData.StudentSubjects.Count() + 1;
+        SampleData.StudentSubjects.Add(newStudentSubject);
+
+        return Ok(newStudentSubject);
+    }
+
     [HttpPut]
-    public IActionResult UpdateStudent(int key, string values)
-    {
+    public IActionResult UpdateStudent(int key, string values) {
         var student = SampleData.Students.First(s => s.ID == key);
-        var updatedStudent = JsonSerializer.Deserialize<Student>(values, new JsonSerializerOptions { PropertyNameCaseInsensitive = true });
-        if (updatedStudent == null) return BadRequest();
-
-        student.Name = updatedStudent.Name ?? student.Name;
-        student.Subjects = updatedStudent.Subjects ?? student.Subjects;
+        JsonConvert.PopulateObject(values, student);
 
         return Ok(student);
     }
 
+    [HttpPut]
+    public IActionResult UpdateStudentSubject(int key, string values) {
+        var studentSubject = SampleData.StudentSubjects.First(s => s.ID == key);
+        JsonConvert.PopulateObject(values, studentSubject);
+
+        return Ok(studentSubject);
+    }
+
     [HttpDelete]
-    public void DeleteStudent(int key)
-    {
+    public void DeleteStudent(int key) {
         var student = SampleData.Students.First(s => s.ID == key);
         SampleData.Students.Remove(student);
     }
 
+    [HttpDelete]
+    public void DeleteStudentSubject(int key) {
+        var studentSubject = SampleData.StudentSubjects.First(s => s.ID == key);
+        SampleData.StudentSubjects.Remove(studentSubject);
+    }
 }