refresh index after all index, update, delete

SOFTNETWORK-APP · Jun 18, 2024 · ea28509 · ea28509
1 parent 02af3c4
commit ea28509
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 14 deletions.
diff --git a/client/src/main/scala/app/softnetwork/elastic/client/ElasticClientApi.scala b/client/src/main/scala/app/softnetwork/elastic/client/ElasticClientApi.scala
@@ -140,7 +140,7 @@ trait IndexApi { _: RefreshApi =>
       _type,
       entity.uuid,
       serialization.write[U](entity)
-    ) && this.refresh(index.getOrElse(_type))
+    )
   }
 
   def index(index: String, _type: String, id: String, source: String): Boolean
@@ -152,7 +152,6 @@ trait IndexApi { _: RefreshApi =>
   )(implicit u: ClassTag[U], ec: ExecutionContext, formats: Formats): Future[Boolean] = {
     val _type = maybeType.getOrElse(u.runtimeClass.getSimpleName.toLowerCase)
     indexAsync(index.getOrElse(_type), _type, entity.uuid, serialization.write[U](entity))
-      .map(_ && this.refresh(index.getOrElse(_type)))
   }
 
   def indexAsync(index: String, _type: String, id: String, source: String)(implicit
@@ -174,7 +173,7 @@ trait UpdateApi { _: RefreshApi =>
       entity.uuid,
       serialization.write[U](entity),
       upsert
-    ) && this.refresh(index.getOrElse(_type))
+    )
   }
 
   def update(index: String, _type: String, id: String, source: String, upsert: Boolean): Boolean
@@ -194,7 +193,6 @@ trait UpdateApi { _: RefreshApi =>
         serialization.write[U](entity),
         upsert
       )
-      .map(_ && this.refresh(index.getOrElse(_type)))
   }
 
   def updateAsync(index: String, _type: String, id: String, source: String, upsert: Boolean)(
@@ -209,9 +207,7 @@ trait DeleteApi { _: RefreshApi =>
     maybeType: Option[String] = None
   )(implicit u: ClassTag[U]): Boolean = {
     val _type = maybeType.getOrElse(u.runtimeClass.getSimpleName.toLowerCase)
-    delete(entity.uuid, index.getOrElse(_type), _type) && this.refresh(
-      index.getOrElse(_type)
-    )
+    delete(entity.uuid, index.getOrElse(_type), _type)
   }
 
   def delete(uuid: String, index: String, _type: String): Boolean
@@ -223,7 +219,6 @@ trait DeleteApi { _: RefreshApi =>
   )(implicit u: ClassTag[U], ec: ExecutionContext): Future[Boolean] = {
     val _type = maybeType.getOrElse(u.runtimeClass.getSimpleName.toLowerCase)
     deleteAsync(entity.uuid, index.getOrElse(_type), _type)
-      .map(_ && this.refresh(index.getOrElse(_type)))
   }
 
   def deleteAsync(uuid: String, index: String, _type: String)(implicit

diff --git a/client/src/main/scala/app/softnetwork/elastic/client/jest/JestClientApi.scala b/client/src/main/scala/app/softnetwork/elastic/client/jest/JestClientApi.scala
@@ -236,7 +236,7 @@ trait JestIndexApi extends IndexApi with JestClientCompanion { _: RefreshApi =>
       case Success(s) =>
         if (!s.isSucceeded)
           logger.error(s.getErrorMessage)
-        s.isSucceeded
+        s.isSucceeded && this.refresh(index)
       case Failure(f) =>
         logger.error(f.getMessage, f)
         false
@@ -251,7 +251,7 @@ trait JestIndexApi extends IndexApi with JestClientCompanion { _: RefreshApi =>
     apply().executeAsyncPromise(
       new Index.Builder(source).index(index).`type`(_type).id(id).build()
     ) onComplete {
-      case Success(s) => promise.success(s.isSucceeded)
+      case Success(s) => promise.success(s.isSucceeded && this.refresh(index))
       case Failure(f) =>
         logger.error(f.getMessage, f)
         promise.failure(f)
@@ -282,7 +282,7 @@ trait JestUpdateApi extends UpdateApi with JestClientCompanion { _: RefreshApi =
       case Success(s) =>
         if (!s.isSucceeded)
           logger.error(s.getErrorMessage)
-        s.isSucceeded
+        s.isSucceeded && this.refresh(index)
       case Failure(f) =>
         logger.error(f.getMessage, f)
         false
@@ -309,7 +309,7 @@ trait JestUpdateApi extends UpdateApi with JestClientCompanion { _: RefreshApi =
       case Success(s) =>
         if (!s.isSucceeded)
           logger.error(s.getErrorMessage)
-        promise.success(s.isSucceeded)
+        promise.success(s.isSucceeded && this.refresh(index))
       case Failure(f) =>
         logger.error(f.getMessage, f)
         promise.failure(f)
@@ -327,7 +327,7 @@ trait JestDeleteApi extends DeleteApi with JestClientCompanion { _: RefreshApi =
     if (!result.isSucceeded) {
       logger.error(result.getErrorMessage)
     }
-    result.isSucceeded
+    result.isSucceeded && this.refresh(index)
   }
 
   override def deleteAsync(uuid: String, index: String, _type: String)(implicit
@@ -341,7 +341,7 @@ trait JestDeleteApi extends DeleteApi with JestClientCompanion { _: RefreshApi =
       case Success(s) =>
         if (!s.isSucceeded)
           logger.error(s.getErrorMessage)
-        promise.success(s.isSucceeded)
+        promise.success(s.isSucceeded && this.refresh(index))
       case Failure(f) =>
         logger.error(f.getMessage, f)
         promise.failure(f)