Use error code name from server

MerginMaps · Nov 21, 2024 · 7755a68 · 7755a68 · inputapp-bot · Nov 21, 2024
1 parent c9ba543
commit 7755a68
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 17 deletions.
diff --git a/app/qml/main.qml b/app/qml/main.qml
@@ -865,9 +865,6 @@ ApplicationWindow {
           // just banner that we will try again
           __notificationModel.addInfo( qsTr( "Somebody else is syncing, we will try again later" ) )
         }
-        else if ( errorType === MM.SyncError.MonthlyContributorsLimitHit ){
-          monthlyContributorsLimitDialog.open()
-        }
         else
         {
           syncFailedDialog.detailedText = qsTr( "Details" ) + ": " + errorMessage
@@ -904,6 +901,10 @@ ApplicationWindow {
       storageLimitDialog.open()
     }
 
+    function onMonthlyContributorLimitReached( uploadSize ) {
+      monthlyContributorsLimitDialog.open()
+    }
+
     function onProjectLimitReached( maxProjects, errorMsg ) {
       __merginApi.getUserInfo()
       if (__merginApi.apiSupportsSubscriptions) {

diff --git a/app/synchronizationerror.cpp b/app/synchronizationerror.cpp
@@ -37,16 +37,6 @@ SynchronizationError::ErrorType SynchronizationError::errorType( int errorCode,
     // Project no longer exists / is on different server
     return ErrorType::ProjectNotFound;
   }
-  else if ( errorCode == 422 )
-  {
-    // Hit the maximun number of contributor per month
-    if ( errorMessage.contains( QStringLiteral( "Maximum number of workspace contributors" ) ) )
-    {
-      return ErrorType::MonthlyContributorsLimitHit;
-    }
-
-    return ErrorType::UnknownError;
-  }
   else if ( errorCode >= 500 )
   {
     // Exceptions in server code or maintenance mode

diff --git a/app/synchronizationerror.h b/app/synchronizationerror.h
@@ -31,7 +31,6 @@ class SynchronizationError
       ProjectNotFound,
       VersionMismatch,
       ServerError,
-      MonthlyContributorsLimitHit,
       UnknownError
     };
     Q_ENUMS( ErrorType );

diff --git a/core/merginapi.cpp b/core/merginapi.cpp
@@ -2117,14 +2117,13 @@ void MerginApi::pushStartReplyFinished()
       serverMsg = sSyncCanceledMessage;
 
     QString code = extractServerErrorCode( data );
-    bool showLimitReachedDialog = EnumHelper::isEqual( code, ErrorCode::StorageLimitHit );
 
     CoreUtils::log( "push " + projectFullName, QStringLiteral( "FAILED - %1. %2" ).arg( r->errorString(), serverMsg ) );
 
     transaction.replyPushStart->deleteLater();
     transaction.replyPushStart = nullptr;
 
-    if ( showLimitReachedDialog )
+    if ( EnumHelper::isEqual( code, ErrorCode::StorageLimitHit ) )
     {
       const QList<MerginFile> files = transaction.pushQueue;
       qreal uploadSize = 0;
@@ -2144,6 +2143,10 @@ void MerginApi::pushStartReplyFinished()
         deleteProject( projectNamespace, projectName, false );
       }
     }
+    else if ( EnumHelper::isEqual( code, ErrorCode::MonthlyContributorsLimitHit ) )
+    {
+      emit monthlyContributorLimitReached( serverMsg );
+    }
     else
     {
       int httpCode = r->attribute( QNetworkRequest::HttpStatusCodeAttribute ).toInt();

diff --git a/core/merginapi.h b/core/merginapi.h
@@ -195,7 +195,8 @@ class ErrorCode
     {
       Unknown = 0,
       ProjectsLimitHit,
-      StorageLimitHit
+      StorageLimitHit,
+      MonthlyContributorsLimitHit,
     };
     Q_ENUM( Value );
 };
@@ -597,6 +598,7 @@ class MerginApi: public QObject
     );
 
     void storageLimitReached( qreal uploadSize );
+    void monthlyContributorLimitReached( const QString &message );
     void projectLimitReached( int maxProjects, const QString &message );
     void migrationRequested( const QString &version );
     void notifySuccess( const QString &message );