Add WorldId to CreateWorldResponse and update tests

ProjektAdLer · Dec 5, 2023 · fafafde · fafafde
1 parent 5cf5ff1
commit fafafde
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 4 deletions.
diff --git a/...ackend.Application.UnitTests/World/WorldManagement/UploadWorld/UploadCourseUseCaseTest.cs b/...ackend.Application.UnitTests/World/WorldManagement/UploadWorld/UploadCourseUseCaseTest.cs
@@ -8,6 +8,7 @@
 using AdLerBackend.Application.LMS.GetUserData;
 using AdLerBackend.Application.World.WorldManagement.UploadWorld;
 using AdLerBackend.Domain.Entities;
+using AdLerBackend.Domain.UnitTests.TestingUtils;
 using AdLerBackend.Infrastructure.Services;
 using AutoBogus;
 using MediatR;
@@ -31,7 +32,8 @@ public class UploadWorldUseCaseTest
     [SetUp]
     public void Setup()
     {
-        _configuration = Options.Create(new BackendConfig {MoodleUrl = "http://localhost"});
+        _configuration = Options.Create(new BackendConfig
+            {MoodleUrl = "http://localhost", AdLerEngineUrl = "http://localhost"});
 
         _lmsBackupProcessor = Substitute.For<ILmsBackupProcessor>();
         _mediator = Substitute.For<IMediator>();
@@ -89,6 +91,9 @@ public async Task Handle_Valid_TriggersUpload()
             ElementUuid = "path1"
         };
 
+        _worldRepository.AddAsync(Arg.Any<WorldEntity>())
+            .Returns(WorldEntityFactory.CreateWorldEntity(id: 1));
+
         _lmsBackupProcessor.GetWorldDescriptionFromBackup(Arg.Any<Stream>()).Returns(fakedDsl);
 
         _lmsBackupProcessor.GetH5PFilesFromBackup(Arg.Any<Stream>()).Returns(new List<H5PDto>
@@ -118,7 +123,7 @@ public async Task Handle_Valid_TriggersUpload()
         atfStream.Position = 0;
 
         // Act
-        await systemUnderTest.Handle(new UploadWorldCommand
+        var result = await systemUnderTest.Handle(new UploadWorldCommand
         {
             BackupFileStream = new MemoryStream(),
             ATFFileStream = atfStream,
@@ -128,6 +133,11 @@ await systemUnderTest.Handle(new UploadWorldCommand
         // Assert that AddAsync has been called with the Correct entity
         await _worldRepository.Received(1)
             .AddAsync(Arg.Is<WorldEntity>(x => x.Name == "TESTNAME"));
+
+        Assert.That(result, Is.Not.Null);
+        Assert.That(result.WorldId, Is.EqualTo(1));
+        Assert.That(result.World3DUrl, Is.EqualTo("http://localhost"));
+        Assert.That(result.WorldLmsUrl, Is.EqualTo("http://localhost/course/view.php?id=1337"));
     }
 
 
@@ -146,6 +156,9 @@ public async Task Handle_ValidNoH5p_TriggersUpload()
             UserId = 1337
         });
 
+        _worldRepository.AddAsync(Arg.Any<WorldEntity>())
+            .Returns(WorldEntityFactory.CreateWorldEntity(id: 1));
+
         var fakedDsl = AutoFaker.Generate<WorldAtfResponse>();
 
         _ilms.UploadCourseWorldToLMS(Arg.Any<string>(), Arg.Any<Stream>()).Returns(new LMSCourseCreationResponse
@@ -166,7 +179,7 @@ public async Task Handle_ValidNoH5p_TriggersUpload()
 
 
         // Act
-        await systemUnderTest.Handle(new UploadWorldCommand
+        var result = await systemUnderTest.Handle(new UploadWorldCommand
         {
             BackupFileStream = new MemoryStream(),
             ATFFileStream = new MemoryStream(),
@@ -176,5 +189,10 @@ await systemUnderTest.Handle(new UploadWorldCommand
         // Assert that AddAsync has been called with the Correct entity
         await _worldRepository.Received(1)
             .AddAsync(Arg.Is<WorldEntity>(x => x.Name == "TESTNAME"));
+
+        Assert.That(result, Is.Not.Null);
+        Assert.That(result.WorldId, Is.EqualTo(1));
+        Assert.That(result.World3DUrl, Is.EqualTo("http://localhost"));
+        Assert.That(result.WorldLmsUrl, Is.EqualTo("http://localhost/course/view.php?id=1337"));
     }
 }
diff --git a/AdLerBackend.Application/Common/Responses/World/CreateWorldResponse.cs b/AdLerBackend.Application/Common/Responses/World/CreateWorldResponse.cs
@@ -2,6 +2,7 @@
 
 public class CreateWorldResponse
 {
+    public int WorldId { get; set; }
     public string WorldNameInLms { get; set; }
     public string WorldLmsUrl { get; set; }
     public string World3DUrl { get; set; } = "Coming soon :)";

diff --git a/AdLerBackend.Application/World/WorldManagement/UploadWorld/UploadWorldUseCase.cs b/AdLerBackend.Application/World/WorldManagement/UploadWorld/UploadWorldUseCase.cs
@@ -76,10 +76,12 @@ public async Task<CreateWorldResponse> Handle(UploadWorldCommand request, Cancel
             lmsCourseCreationResponse.CourseLmsId
         );
 
-        await _worldRepository.AddAsync(courseEntity);
+        var createdEntity = await _worldRepository.AddAsync(courseEntity);
 
         return new CreateWorldResponse
         {
+            // When the world is created, the id is set
+            WorldId = createdEntity.Id!.Value,
             World3DUrl = _configuration.AdLerEngineUrl ?? "Adler Engine URL not set",
             WorldLmsUrl = _configuration.MoodleUrl + "/course/view.php?id=" + lmsCourseCreationResponse.CourseLmsId,
             WorldNameInLms = courseEntity.Name