logging queries changed to not return revisioned apis.

wso2 · Jul 19, 2023 · c824e59 · c824e59
1 parent 0b7f837
commit c824e59
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/...bon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/dao/constants/SQLConstants.java b/...bon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/dao/constants/SQLConstants.java
@@ -3025,28 +3025,30 @@ public class SQLConstants {
  "SELECT AM_API.API_UUID, AUM.LOG_LEVEL, AM_API.API_NAME, AUM.HTTP_METHOD, AUM.URL_PATTERN, " +
  "AM_API.CONTEXT, AM_API.API_VERSION FROM AM_API INNER JOIN " +
  "AM_API_URL_MAPPING AUM ON AUM.API_ID = AM_API.API_ID WHERE AUM.LOG_LEVEL = 'OFF' " +
- "AND AM_API.ORGANIZATION= ?";
+ "AND AM_API.ORGANIZATION= ? AND AUM.REVISION_UUID IS NULL";
  public static final String RETRIEVE_PER_API_LOGGING_BASIC_SQL =
  "SELECT AM_API.API_UUID, AM_API.LOG_LEVEL, AM_API.API_NAME, AM_API.CONTEXT, AM_API.API_VERSION " +
  "FROM AM_API WHERE AM_API.LOG_LEVEL = 'BASIC' AND AM_API.ORGANIZATION=?";
  public static final String RETRIEVE_PER_API_RESOURCE_LOGGING_BASIC_SQL =
  "SELECT AM_API.API_UUID, AUM.LOG_LEVEL, AM_API.API_NAME, AUM.HTTP_METHOD, AUM.URL_PATTERN, " +
  "AM_API.CONTEXT, AM_API.API_VERSION FROM AM_API INNER JOIN AM_API_URL_MAPPING AUM ON " +
- "AUM.API_ID = AM_API.API_ID WHERE AUM.LOG_LEVEL = 'BASIC' AND AM_API.ORGANIZATION= ?";
+ "AUM.API_ID = AM_API.API_ID WHERE AUM.LOG_LEVEL = 'BASIC' AND AM_API.ORGANIZATION= ?" +
+ "AND AUM.REVISION_UUID IS NULL";
  public static final String RETRIEVE_PER_API_LOGGING_STANDARD_SQL =
  "SELECT AM_API.API_UUID, AM_API.LOG_LEVEL, AM_API.API_NAME, AM_API.CONTEXT, AM_API.API_VERSION " +
  "FROM AM_API WHERE AM_API.LOG_LEVEL = 'STANDARD' AND AM_API.ORGANIZATION=?";
  public static final String RETRIEVE_PER_API_RESOURCE_LOGGING_STANDARD_SQL =
  "SELECT AM_API.API_UUID, AUM.LOG_LEVEL, AM_API.API_NAME, AUM.HTTP_METHOD, AUM.URL_PATTERN, AM_API.CONTEXT," +
  " AM_API.API_VERSION FROM AM_API INNER JOIN AM_API_URL_MAPPING AUM ON AUM.API_ID = AM_API.API_ID " +
- "WHERE AUM.LOG_LEVEL = 'STANDARD' AND AM_API.ORGANIZATION= ?";
+ "WHERE AUM.LOG_LEVEL = 'STANDARD' AND AM_API.ORGANIZATION= ? AND AUM.REVISION_UUID IS NULL";
  public static final String RETRIEVE_PER_API_LOGGING_FULL_SQL =
  "SELECT AM_API.API_UUID, AM_API.LOG_LEVEL, AM_API.API_NAME, AM_API.CONTEXT, AM_API.API_VERSION " +
  "FROM AM_API WHERE AM_API.LOG_LEVEL = 'FULL' AND AM_API.ORGANIZATION=?";
  public static final String RETRIEVE_PER_API_RESOURCE_LOGGING_FULL_SQL =
  "SELECT AM_API.API_UUID, AUM.LOG_LEVEL, AM_API.API_NAME, AUM.HTTP_METHOD, AUM.URL_PATTERN, " +
  "AM_API.CONTEXT, AM_API.API_VERSION FROM AM_API INNER JOIN AM_API_URL_MAPPING AUM ON " +
- "AUM.API_ID = AM_API.API_ID WHERE AUM.LOG_LEVEL = 'FULL' AND AM_API.ORGANIZATION= ?";
+ "AUM.API_ID = AM_API.API_ID WHERE AUM.LOG_LEVEL = 'FULL' AND AM_API.ORGANIZATION= ?" +
+ "AND AUM.REVISION_UUID IS NULL";
  public static final String RETRIEVE_ALL_PER_API_LOGGING_SQL =
  "SELECT AM_API.API_UUID, AM_API.LOG_LEVEL, AM_API.API_NAME, AM_API.CONTEXT, AM_API.API_VERSION " +
  "FROM AM_API WHERE AM_API.LOG_LEVEL <> 'OFF'";
@@ -3060,7 +3062,7 @@ public class SQLConstants {
  public static final String RETRIEVE_PER_API_RESOURCE_LOGGING_ALL_SQL =
  "SELECT API.API_UUID, AUM.LOG_LEVEL, AUM.HTTP_METHOD, AUM.URL_PATTERN, API.API_NAME, API.CONTEXT," +
  " API.API_VERSION FROM AM_API API INNER JOIN AM_API_URL_MAPPING AUM ON " +
- "AUM.API_ID = API.API_ID WHERE API.ORGANIZATION= ?";
+ "AUM.API_ID = API.API_ID WHERE API.ORGANIZATION= ? AND AUM.REVISION_UUID IS NULL";
  public static final String RETRIEVE_PER_API_LOGGING_BY_UUID_SQL =
  "SELECT AM_API.API_UUID, AM_API.LOG_LEVEL, AM_API.API_NAME, AM_API.CONTEXT, AM_API.API_VERSION " +
  "FROM AM_API WHERE AM_API.API_UUID = ? AND AM_API.ORGANIZATION=?";