pretty much nothing cahnged, did mostly everything the lecturer sugested

SwipeWords/Controllers/FlashcardsController.cs

@@ -1,19 +1,22 @@
 using Microsoft.AspNetCore.Mvc;
 using SwipeWords.Data;
 using SwipeWords.Models;
+using SwipeWords.Services;
 
 namespace SwipeWords.Controllers;
 
 [ApiController]
 [Route("api/[controller]")]
 public class FlashcardsController : ControllerBase
 {
-    private readonly FlashcardGameDatabaseContext _context;
+    private readonly FlashcardService _flashcardService;
+    private readonly FlashcardGameDatabaseContext _dbContext;
     private readonly ILogger<FlashcardsController> _logger;
 
-    public FlashcardsController(FlashcardGameDatabaseContext context, ILogger<FlashcardsController> logger)
+    public FlashcardsController(FlashcardService flashcardService, FlashcardGameDatabaseContext dbContext, ILogger<FlashcardsController> logger)
     {
-        _context = context;
+        _dbContext = dbContext;
+        _flashcardService = flashcardService;
         _logger = logger;
     }
 
@@ -23,11 +26,9 @@ public async Task<IActionResult> GetFlashcards(int wordCount = 5)
     {
         try
         {
-            var apiService = new ExternalApiService();
-            var flashcard = new Flashcard();
-            await flashcard.InitializeAsync(_context, apiService, wordCount);
-            var mixedWords = flashcard.GetMixedWords();
-            return Ok(new { flashcardId = flashcard.Id, mixedWords });
+            await _flashcardService.InitializeAsync(wordCount);
+            var mixedWords = _flashcardService.GetMixedWords();
+            return Ok(new { flashcardId = _flashcardService.Id, mixedWords });
         }
         catch (Exception ex)
         {
@@ -42,16 +43,14 @@ public IActionResult CalculateScore([FromBody] ScoreRequest request)
     {
         try
         {
-            var userCorrectList = request.UserCorrect.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries)
-                .ToList();
-            var userIncorrectList = request.UserIncorrect.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries)
-                .ToList();
+            var userCorrectList = request.UserCorrect.Split(',').ToList();
+            var userIncorrectList = request.UserIncorrect.Split(',').ToList();
 
-            var (score, correctWords, incorrectWords) = Flashcard.CalculateScore(
+            var (score, correctWords, incorrectWords) = FlashcardService.CalculateScore(
                 userCorrectList,
                 userIncorrectList,
                 request.FlashcardId,
-                _context);
+                _dbContext);
 
             return Ok(new { score, correctWords, incorrectWords });
         }

SwipeWords/Models/FlashcardExtensions.cs

@@ -1,4 +1,5 @@
 using SwipeWords.Data;
+using SwipeWords.Services;
 
 namespace SwipeWords.Models;
 

SwipeWords/Program.cs

@@ -1,11 +1,15 @@
 using Microsoft.EntityFrameworkCore;
 using SwipeWords.Data;
+using SwipeWords.Services;
 
 var builder = WebApplication.CreateBuilder(args);
 
 var connectionString = builder.Configuration.GetConnectionString("FlashcardGameDbConnectionString");
 
 // Add services to the container.
+builder.Services.AddScoped<FlashcardService>();
+builder.Services.AddSingleton<ExternalApiService>();
+builder.Services.AddScoped<FlashcardGameDatabaseContext>();
 builder.Services.AddEndpointsApiExplorer();
 builder.Services.AddSwaggerGen();
 builder.Services.AddControllers();

SwipeWords/test/FlashcardScoreTests.cs

@@ -1,6 +1,7 @@
 using Microsoft.EntityFrameworkCore;
 using SwipeWords.Data;
 using SwipeWords.Models;
+using SwipeWords.Services;
 using Xunit;
 
 public class FlashcardScoreTests
@@ -36,7 +37,7 @@ public void CalculateScore_ShouldReturnCorrectScoreAndWords()
 
         // Act
         var (score, correctWords, incorrectWords) =
-            Flashcard.CalculateScore(userCorrect, userIncorrect, flashcardId, context);
+            FlashcardService.CalculateScore(userCorrect, userIncorrect, flashcardId, context);
 
         // Assert
         Assert.Equal(3, score);