Merge pull request #11 from dotClique/i1/database-models

Add additional database models and RequirementController

SpeiderappAPI/Controllers/BadgeController.cs

@@ -27,7 +27,7 @@ public async Task<ActionResult<IEnumerable<Badge>>> GetBadges()
             return await _context.Badges/* .Include(badge => badge.Resources) */.ToListAsync();
         }
 
-        // GET: api/Badge/5
+        // GET: api/Badge/<id>
         [HttpGet("{id:long}")]
         public async Task<ActionResult<Badge>> GetBadge(long id)
         {
@@ -41,7 +41,7 @@ public async Task<ActionResult<Badge>> GetBadge(long id)
             return badge;
         }
 
-        // PUT: api/Badge/5
+        // PUT: api/Badge/<id>
         // To protect from over-posting attacks, enable the specific properties you want to bind to, for
         // more details, see https://go.microsoft.com/fwlink/?linkid=2123754.
         [HttpPut("{id:long}")]
@@ -85,7 +85,7 @@ public async Task<ActionResult<Badge>> PostBadge(Badge badge)
             return CreatedAtAction("GetBadge", new { id = badge.RequirementID }, badge);
         }
 
-        // DELETE: api/Badge/5
+        // DELETE: api/Badge/<id>
         [HttpDelete("{id:long}")]
         public async Task<ActionResult<Badge>> DeleteBadge(long id)
         {

SpeiderappAPI/Controllers/RequirementController.cs

@@ -0,0 +1,52 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
+using SpeiderappAPI.Database;
+using SpeiderappAPI.Models;
+
+namespace SpeiderappAPI.Controllers
+{
+    [Route("api/[controller]")]
+    [ApiController]
+    public class RequirementController : ControllerBase
+    {
+        private readonly ApiContext _context;
+
+        public RequirementController(ApiContext context)
+        {
+            _context = context;
+        }
+
+        // GET: api/Requirement
+        [HttpGet]
+        public async Task<ActionResult<IEnumerable<Requirement>>> GetRequirements()
+        {
+            return await _context.Requirements
+                .Where(requirement => requirement.Discriminator == "Requirement")
+                .ToListAsync();
+        }
+
+        // GET: api/Requirement/all
+        [HttpGet("all")]
+        public async Task<ActionResult<IEnumerable<Requirement>>> GetRequirementsAll()
+        {
+            return await _context.Requirements.ToListAsync();
+        }
+
+        // Get: api/Requirement/<id>
+        [HttpGet("{id:long}")]
+        public async Task<ActionResult<Requirement>> GetRequirement(long id)
+        {
+            var requirement = await _context.Requirements.FindAsync(id);
+
+            if (requirement == null)
+            {
+                return NotFound();
+            }
+
+            return requirement;
+        }
+    }
+}

SpeiderappAPI/Controllers/ResourceController.cs

@@ -26,7 +26,7 @@ public async Task<ActionResult<IEnumerable<Resource>>> GetResource()
             return await _context.Resources.ToListAsync();
         }
 
-        // GET: api/Resource/5
+        // GET: api/Resource/<id>
         [HttpGet("{id:long}")]
         public async Task<ActionResult<Resource>> GetResource(long id)
         {
@@ -40,21 +40,7 @@ public async Task<ActionResult<Resource>> GetResource(long id)
             return resource;
         }
 
-        // GET: api/Resource/badge/5
-        [HttpGet("badge/{id:long}")]
-        public async Task<ActionResult<Requirement?>> GetBadgeFor(long id)
-        {
-            var resource = await _context.Resources.FindAsync(id);
-
-            if (resource == null)
-            {
-                return NotFound();
-            }
-
-            return resource.Requirement;
-        }
-
-        // PUT: api/Resource/5
+        // PUT: api/Resource/<id>
         // To protect from over-posting attacks, see https://go.microsoft.com/fwlink/?linkid=2123754
         [HttpPut("{id:long}")]
         public async Task<IActionResult> PutResource(long id, Resource resource)
@@ -96,7 +82,7 @@ public async Task<ActionResult<Resource>> PostResource(Resource resource)
             return CreatedAtAction("GetResource", new { id = resource.ResourceID }, resource);
         }
 
-        // DELETE: api/Resource/5
+        // DELETE: api/Resource/<id>
         [HttpDelete("{id}")]
         public async Task<IActionResult> DeleteResource(long id)
         {

SpeiderappAPI/Controllers/UserController.cs

@@ -26,7 +26,7 @@ public async Task<ActionResult<IEnumerable<User>>> GetUsers()
             return await _context.Users.ToListAsync();
         }
 
-        // GET: api/User/5
+        // GET: api/User/<id>
         [HttpGet("{id:long}")]
         public async Task<ActionResult<User>> GetUser(long id)
         {
@@ -40,7 +40,7 @@ public async Task<ActionResult<User>> GetUser(long id)
             return user;
         }
 
-        // PUT: api/User/5
+        // PUT: api/User/<id>
         // To protect from over-posting attacks, see https://go.microsoft.com/fwlink/?linkid=2123754
         [HttpPut("{id:long}")]
         public async Task<IActionResult> PutUser(long id, User user)
@@ -82,7 +82,7 @@ public async Task<ActionResult<User>> PostUser(User user)
             return CreatedAtAction("GetUser", new { id = user.UserID }, user);
         }
 
-        // DELETE: api/User/5
+        // DELETE: api/User/<id>
         [HttpDelete("{id:long}")]
         public async Task<IActionResult> DeleteUser(long id)
         {

SpeiderappAPI/Database/ApiContext.cs

@@ -8,6 +8,8 @@ namespace SpeiderappAPI.Database
     public class ApiContext : DbContext
     {
         public DbSet<Badge> Badges { get; set; } = null!;
+        public DbSet<MultipleChoice> MultipleChoices { get; set; } = null!;
+        public DbSet<UserDefined> UserDefineds { get; set; } = null!;
         public DbSet<Requirement> Requirements { get; set; } = null!;
         public DbSet<RequirementPrerequisite> RequirementPrerequisites { get; set; } = null!;
         public DbSet<User> Users { get; set; } = null!;