Add fallback for listProjectsByName

Author: Withalion

app/projectsmodel.cpp

@@ -39,6 +39,7 @@ void ProjectsModel::initializeProjectsModel()
   if ( mModelType == ProjectModelTypes::LocalProjectsModel )
   {
     connect( mBackend, &MerginApi::listProjectsByNameFinished, this, &ProjectsModel::onListProjectsByNameFinished );
+    connect( mBackend, &MerginApi::refetchBrokenProjectsFinished, this, &ProjectsModel::onRefetchBrokenProjectsFinished );
     loadLocalProjects();
   }
   else if ( mModelType != ProjectModelTypes::RecentProjectsModel )
@@ -268,13 +269,32 @@ void ProjectsModel::onListProjectsByNameFinished( const MerginProjectsList &merg
     return;
   }
 
+  // filter out projects which returned errors and refetch them by ID
+  const QStringList brokenProjects = filterBrokenProjects( merginProjects );
+  if ( !brokenProjects.isEmpty() )
+  {
+    mBackend->refetchBrokenProjects( brokenProjects );
+  }
+
   beginResetModel();
   mergeProjects( merginProjects );
   endResetModel();
 
   setModelIsLoading( false );
 }
 
+void ProjectsModel::onRefetchBrokenProjectsFinished( const MerginProjectsList &merginProjects )
+{
+  if ( merginProjects.isEmpty() )
+  {
+    return;
+  }
+
+  beginResetModel();
+  mergeProjects( merginProjects, MergeStrategy::KeepPrevious );
+  endResetModel();
+}
+
 void ProjectsModel::mergeProjects( const MerginProjectsList &merginProjects, MergeStrategy mergeStrategy )
 {
   const LocalProjectsDict localProjects = mLocalProjectsManager->projects();
@@ -651,6 +671,26 @@ void ProjectsModel::loadLocalProjects()
   }
 }
 
+QStringList ProjectsModel::filterBrokenProjects( const MerginProjectsList &list )
+{
+  QStringList errorProjects;
+  for ( MerginProject project : list )
+  {
+    if ( !project.remoteError.isEmpty() )
+    {
+      const auto res = std::find_if( mProjects.begin(), mProjects.end(), [&project]( const Project & localProject )
+      {
+        return project.fullName() == localProject.fullName();
+      } );
+      if ( res != mProjects.end() )
+      {
+        errorProjects.append( res->id() );
+      }
+    }
+  }
+  return errorProjects;
+}
+
 int ProjectsModel::projectIndexFromId( const QString &projectId ) const
 {
   for ( int i = 0; i < mProjects.count(); i++ )

app/projectsmodel.h

@@ -165,6 +165,7 @@ class ProjectsModel : public QAbstractListModel
     // MerginAPI - project list signals
     void onListProjectsFinished( const MerginProjectsList &merginProjects, int projectsCount, int page, const QString &requestId );
     void onListProjectsByNameFinished( const MerginProjectsList &merginProjects, const QString &requestId );
+    void onRefetchBrokenProjectsFinished( const MerginProjectsList &merginProjects );
 
     // Synchronization signals
     void onProjectSyncStarted( const QString &projectId );
@@ -203,7 +204,7 @@ class ProjectsModel : public QAbstractListModel
     void activeProjectIdChanged( QString projectId );
 
   private:
-
+    QStringList filterBrokenProjects( const MerginProjectsList &list );
     int projectIndexFromId( const QString &projectId ) const;
 
     void setModelIsLoading( bool state );

core/merginapi.cpp

@@ -268,6 +268,12 @@ QString MerginApi::listProjectsByName( const QStringList &projectNames )
   return requestId;
 }
 
+void MerginApi::refetchBrokenProjects( const QStringList &projectIds )
+{
+  const QNetworkReply *reply = getProjectsDetails( projectIds );
+  connect( reply, &QNetworkReply::finished, this, &MerginApi::refetchBrokenProjectsReplyFinished );
+}
+
 
 void MerginApi::downloadNextItem( const QString &projectId )
 {
@@ -1674,7 +1680,7 @@ QNetworkReply *MerginApi::getProjectsDetails( const QStringList &projectIds, con
 {
   if ( withAuth && !validateAuth() )
   {
-    for ( const QString& projectId : projectIds )
+    for ( const QString &projectId : projectIds )
     {
       emit missingAuthorizationError( projectId );
     }
@@ -1687,7 +1693,7 @@ QNetworkReply *MerginApi::getProjectsDetails( const QStringList &projectIds, con
   }
 
   QUrlQuery query;
-  query.addQueryItem( QStringLiteral( "uuids" ), projectIds.join(",") );
+  query.addQueryItem( QStringLiteral( "uuids" ), projectIds.join( "," ) );
 
   QUrl url{};
   url.setUrl( mApiRoot + QStringLiteral( "/v1/project/by_uuids" ) );
@@ -2083,21 +2089,49 @@ void MerginApi::getProjectsDetailsReplyFinished()
         if ( mTransactionalStatus.contains( key ) )
         {
           QJsonObject project = response.value( key ).toObject();
-          QString projectFullName = QString("%1/%2").arg( project.value("namespace").toString(), project.value("name").toString());
+          QString projectFullName = QString( "%1/%2" ).arg( project.value( "namespace" ).toString(), project.value( "name" ).toString() );
           const bool withAuth = r->request().attribute( static_cast<QNetworkRequest::Attribute>( AttrAuthUsed ) ).toBool();
-          if (mTransactionalStatus[key].type == TransactionStatus::Pull )
+          if ( mTransactionalStatus[key].type == TransactionStatus::Pull )
           {
-            pullProject( projectFullName, key, withAuth);
-          } else
+            pullProject( projectFullName, key, withAuth );
+          }
+          else
           {
-            pushProject( projectFullName, key, withAuth);
+            pushProject( projectFullName, key, withAuth );
           }
         }
       }
     }
   }
 }
 
+void MerginApi::refetchBrokenProjectsReplyFinished()
+{
+  QNetworkReply *r = qobject_cast<QNetworkReply *>( sender() );
+  Q_ASSERT( r );
+
+  MerginProjectsList projectList;
+
+  if ( r->error() == QNetworkReply::NoError )
+  {
+    const QByteArray data = r->readAll();
+    const QJsonDocument json = QJsonDocument::fromJson( data );
+    projectList = parseProjectsFromJson( json );
+    CoreUtils::log( "refetch broken projects", QStringLiteral( "Success - got %1 projects" ).arg( projectList.count() ) );
+  }
+  else
+  {
+    QString serverMsg = extractServerErrorMsg( r->readAll() );
+    const QString message = QStringLiteral( "Network API error: %1(): %2. %3" ).arg( QStringLiteral( "refetchBrokenProjects" ), r->errorString(), serverMsg );
+    emit networkErrorOccurred( serverMsg );
+    CoreUtils::log( "refetch broken projects", QStringLiteral( "FAILED - %1" ).arg( message ) );
+  }
+
+  r->deleteLater();
+
+  emit refetchBrokenProjectsFinished( projectList );
+}
+
 
 void MerginApi::finalizeProjectPullCopy( const QString &projectFullName, const QString &projectDir, const QString &tempDir, const QString &filePath, const QList<DownloadQueueItem> &items )
 {
@@ -2535,7 +2569,8 @@ void MerginApi::pullInfoReplyFinished()
       transaction.replyPullProjectInfo = nullptr;
 
       finishProjectSync( projectFullName, projectId, false );
-    } else
+    }
+    else
     {
       const QString serverMsg = extractServerErrorMsg( r->readAll() );
       const QString message = QStringLiteral( "Network API error: %1(): %2" ).arg( QStringLiteral( "projectInfo" ), r->errorString() );

core/merginapi.h

@@ -264,6 +264,14 @@ class MerginApi: public QObject
      */
     QString listProjectsByName( const QStringList &projectNames = QStringList() );
 
+    /**
+     * Fallback method for listProjectsByName, which tries to request projects by IDs instead of names.
+     * Uses getProjectsDetails internally.
+     * \param projectIds QStringList of project IDs
+     * \see listProjectsByName
+     */
+    void refetchBrokenProjects( const QStringList &projectIds );
+
     /**
      * Sends non-blocking POST request to the server to pull (download) a project with a given name.
      * On pullProjectReplyFinished, when a response is received, parses data-stream to files and rewrites local files
@@ -633,6 +641,7 @@ class MerginApi: public QObject
     void projectDataChanged( const QString &projectFullName, const QString &projectId );
     void projectDetached( const QString &projectId );
     void projectAttachedToMergin( const QString &projectId );
+    void refetchBrokenProjectsFinished( const MerginProjectsList &projectList );
 
     void projectAlreadyOnLatestVersion( const QString &projectId );
     void missingAuthorizationError( const QString &projectId );
@@ -676,6 +685,7 @@ class MerginApi: public QObject
     void listProjectsReplyFinished( const QString &requestId );
     void listProjectsByNameReplyFinished( const QString &requestId );
     void getProjectsDetailsReplyFinished();
+    void refetchBrokenProjectsReplyFinished();
 
     // Pull slots
     void pullInfoReplyFinished();