Merge branch 'main' into merge-main-dev

eclipse-tractusx · Jan 18, 2024 · 8d35ebe · 8d35ebe
2 parents f9e606f + eb6e7d6
commit 8d35ebe
Show file tree

Hide file tree

Showing 8 changed files with 355 additions and 142 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,14 @@
 
 New features, fixed bugs, known defects and other noteworthy changes to each release of the Catena-X Portal Backend.
 
+## 1.8.0-RC2
+
+### Bugfix
+* Notification Service
+  * fixed Get: /api/notification/ endpoint which resulted in a 'Sequence contains more than one element' error
+* Registration Service
+  * fixed Put: /api/registration/application/{applicationId}/status endpoint to allow same status as existing status
+
 ## 1.8.0-RC1.1
 
 ### Bugfix

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -20,6 +20,6 @@
 <Project>
   <PropertyGroup>
     <VersionPrefix>1.8.0</VersionPrefix>
-    <VersionSuffix>RC1.1</VersionSuffix>
+    <VersionSuffix>RC2</VersionSuffix>
   </PropertyGroup>
 </Project>
diff --git a/src/portalbackend/PortalBackend.DBAccess/Repositories/NotificationRepository.cs b/src/portalbackend/PortalBackend.DBAccess/Repositories/NotificationRepository.cs
@@ -79,7 +79,7 @@ public Notification DeleteNotification(Guid notificationId) =>
             _dbContext.Notifications.AsNoTracking()
                 .Where(notification =>
                     notification.ReceiverUserId == receiverUserId &&
-                    semantic == SearchSemanticTypeId.AND
+                    (semantic == SearchSemanticTypeId.AND
                         ? ((!isRead.HasValue || notification.IsRead == isRead.Value) &&
                            (!typeId.HasValue || notification.NotificationTypeId == typeId.Value) &&
                            (!topicId.HasValue || notification.NotificationType!.NotificationTypeAssignedTopic!.NotificationTopicId == topicId.Value) &&
@@ -93,7 +93,7 @@ public Notification DeleteNotification(Guid notificationId) =>
                            (onlyDueDate && notification.DueDate.HasValue) ||
                            (doneState.HasValue && notification.Done == doneState.Value) ||
                            (searchTypeIds.Any() && searchTypeIds.Contains(notification.NotificationTypeId)) ||
-                           (searchQuery != null && notification.Content != null && EF.Functions.ILike(notification.Content, $"%{searchQuery.EscapeForILike()}%"))))
+                           (searchQuery != null && notification.Content != null && EF.Functions.ILike(notification.Content, $"%{searchQuery.EscapeForILike()}%")))))
                 .GroupBy(notification => notification.ReceiverUserId),
             sorting switch
             {

diff --git a/src/registration/Registration.Service/BusinessLogic/RegistrationBusinessLogic.cs b/src/registration/Registration.Service/BusinessLogic/RegistrationBusinessLogic.cs
@@ -481,9 +481,13 @@ public async Task<int> SetOwnCompanyApplicationStatusAsync(Guid applicationId, C
             throw new NotFoundException($"CompanyApplication {applicationId} not found");
         }
 
-        ValidateCompanyApplicationStatus(applicationId, status, applicationUserData, applicationRepository, _dateTimeProvider);
+        if (applicationUserData.StatusId != status)
+        {
+            ValidateCompanyApplicationStatus(applicationId, status, applicationUserData, applicationRepository, _dateTimeProvider);
+            return await _portalRepositories.SaveAsync().ConfigureAwait(false);
+        }
 
-        return await _portalRepositories.SaveAsync().ConfigureAwait(false);
+        return 0;
     }
 
     public async Task<CompanyApplicationStatusId> GetOwnCompanyApplicationStatusAsync(Guid applicationId)
@@ -820,7 +824,7 @@ private static void ValidateCompanyApplicationStatus(Guid applicationId,
                 x => x.applicationStatus == applicationData.StatusId && x.status == status))
         {
             throw new ArgumentException(
-                $"invalid status update requested {status}, current status is {applicationData.StatusId}, possible values are: {CompanyApplicationStatusId.SUBMITTED}");
+                $"invalid status update requested {status}, current status is {applicationData.StatusId}, possible values are: {string.Join(",", allowedCombination.Where(x => x.applicationStatus == status).Select(x => x.applicationStatus))}");
         }
 
         applicationRepository.AttachAndModifyCompanyApplication(applicationId, a =>

diff --git a/src/registration/Registration.Service/Controllers/RegistrationController.cs b/src/registration/Registration.Service/Controllers/RegistrationController.cs
@@ -191,7 +191,7 @@ public Task<IEnumerable<CompanyApplicationDeclineData>> GetApplicationsDeclineDa
         /// <param name="applicationId" example="4f0146c6-32aa-4bb1-b844-df7e8babdcb4">Id of the application which status should be set.</param>
         /// <param name="status" example="8">The status that should be set</param>
         /// <returns></returns>
-        /// <remarks>Example: Put: /api/registration/application/4f0146c6-32aa-4bb1-b844-df7e8babdcb4/status</remarks>
+        /// <remarks>Example: Put: /api/registration/application/{applicationId}/status</remarks>
         /// <response code="200">Successfully set the status</response>
         /// <response code="404">CompanyApplication was not found for the given id.</response>
         /// <response code="400">Status must be null.</response>