Fix restore preload guard (#95)

* chore: restore preload guard * chore: restore preload guard
arextest · Oct 24, 2023 · aa216cd · aa216cd
1 parent 2a1e48d
commit aa216cd
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 4 deletions.
diff --git a/arex-storage-config/pom.xml b/arex-storage-config/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.arextest</groupId>
         <artifactId>arex-storage-service</artifactId>
-        <version>1.0.29</version>
+        <version>1.0.30</version>
     </parent>
 
     <artifactId>arex-storage-config</artifactId>

diff --git a/arex-storage-model/pom.xml b/arex-storage-model/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>arex-storage-service</artifactId>
         <groupId>com.arextest</groupId>
-        <version>1.0.29</version>
+        <version>1.0.30</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>arex-model</artifactId>

diff --git a/arex-storage-web-api/pom.xml b/arex-storage-web-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>arex-storage-service</artifactId>
         <groupId>com.arextest</groupId>
-        <version>1.0.29</version>
+        <version>1.0.30</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>arex-storage-web-api</artifactId>

diff --git a/...-storage-web-api/src/main/java/com/arextest/storage/service/PrepareMockResultService.java b/...-storage-web-api/src/main/java/com/arextest/storage/service/PrepareMockResultService.java
@@ -49,6 +49,10 @@ private boolean preload(RepositoryProvider<? extends Mocker> repositoryReader, M
         if (repositoryReader == null) {
             return false;
         }
+        if (mockResultProvider.recordResultCount(categoryType, recordId) > 0) {
+            LOGGER.warn("skip preload cache for category:{},record id:{}", categoryType, recordId);
+            return true;
+        }
         Iterable<? extends Mocker> iterable;
         iterable = repositoryReader.queryRecordList(categoryType, recordId);
         if (iterable == null) {

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
     <groupId>com.arextest</groupId>
     <artifactId>arex-storage-service</artifactId>
     <packaging>pom</packaging>
-    <version>1.0.29</version>
+    <version>1.0.30</version>
 
     <name>${project.groupId}:${project.artifactId}</name>
     <description>Arex-storage is used for data storage.</description>