Merge branch 'hotfix/20220724-no-user-id'

Jenkinsfile

@@ -1,30 +0,0 @@
-pipeline{
-    agent any
-
-    tools{
-        maven '3.8.6'
-        jdk 'JDK 18'
-    }
-
-    stages {
-        stage ('Initialize') {
-           steps {
-               sh '''
-                   echo "PATH = ${PATH}"
-                   echo "M2_HOME = ${M2_HOME}"
-               '''
-           }
-       }
-        stage('Build'){
-            steps{
-                sh 'mvn -Dmaven.test.failure.ignore=true install test'
-            }
-            post{
-                success{
-                    junit 'target/surefire-reports/**/*.xml'
-                    archiveArtifacts artifacts: 'target/*.jar, *.pom', fingerprint: true, followSymlinks: false, onlyIfSuccessful: true
-                }
-            }
-        }
-    }
-}

src/main/java/org/leolo/nrapi/AuthFilter.java

@@ -119,8 +119,8 @@ public class AuthFilter implements Filter {
                 userId = TokenStore.getInstance().getUserIdForToken(token);
             }
             if(authResult) {
-                filterChain.doFilter(servletRequest, servletResponse);
                 servletRequest.setAttribute(Constants.REQ_ATTR_USER_ID, userId);
+                filterChain.doFilter(servletRequest, servletResponse);
             }else{
                 log.warn("{} is not authorized to use the system", ip);
                 ((HttpServletResponse)servletResponse).sendError(403);

src/main/java/org/leolo/nrapi/util/MiscUtilAPI.java

@@ -153,7 +153,6 @@ public class MiscUtilAPI {
             }
         }
         sb.append("}");
-        sb.append(",\"api-version\":\"0.1\"");
         sb.append("}");
         String result = "";
         try(

src/main/java/org/leolo/nrapi/util/RoleUtil.java

@@ -1,46 +0,0 @@
-package org.leolo.nrapi.util;
-
-
-import org.leolo.nrapi.manager.DatabaseManager;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
-public class RoleUtil {
-
-    private static Logger log = LoggerFactory.getLogger(RoleUtil.class);
-
-    public static boolean hasPermission(long userId, String prem){
-        try(
-                Connection conn = DatabaseManager.getInstance().getConnection();
-                PreparedStatement pstmt = conn.prepareStatement(
-                        "SELECT 1 FROM user_perm WHERE user_id = ? AND perm_name = ? " +
-                                "UNION ALL SELECT 1 FROM user_groups ug JOIN group_perm gp on ug.group_id = gp.group_id " +
-                                "WHERE ug.user_id = ? and gp.perm_name = ?"
-                )
-        ){
-            pstmt.setLong(1, userId);
-            pstmt.setString(2, prem);
-            pstmt.setLong(3, userId);
-            pstmt.setString(4, prem);
-            try(ResultSet rs = pstmt.executeQuery()){
-                return  rs.next();
-            }
-        }catch (SQLException e){
-            log.error(e.getMessage(),e);
-        }
-        return false;
-    }
-
-    public static boolean hasPermission(String permission){
-        long userId = HttpReqRespUtils.getUserId();
-        if(userId!=-1){
-            return hasPermission(userId, permission);
-        }
-        return false;
-    }
-}

src/main/java/org/leolo/nrapi/v0/api/ScheduleSearchAPI.java

@@ -66,10 +66,10 @@ public class ScheduleSearchAPI {
                 queryBuilder.setPlatforms(platform.split(","));
             }
             if(previous!=null&&previous.length()>0){
-                queryBuilder.setPrevLocation(previous.split(","));
+                queryBuilder.setPrevLocation(previous);
             }
             if(next!=null&&next.length()>0){
-                queryBuilder.setNextLocation(next.split(","));
+                queryBuilder.setNextLocation(next);
             }
             list.addAll(queryBuilder.setTableGroup(TableGroup.LONG_TERM_PLANNING).execute());
             list.addAll(queryBuilder.setTableGroup(TableGroup.SHORT_TERM_PLANNING).execute());

src/main/java/org/leolo/nrapi/v0/api/ScheduleSearchQueryBuilder.java

@@ -32,8 +32,8 @@ class ScheduleSearchQueryBuilder {
     private boolean strictMode = false;
     private String[] platforms;
     private boolean stopOnly = false;
-    private String[] prevLocation;
+    private String prevLocation;
-    private String[] nextLocation;
+    private String nextLocation;
 
     public ScheduleSearchQueryBuilder setTableGroup(TableGroup tableGroup) {
         this.tableGroup = tableGroup;
@@ -76,12 +76,12 @@ class ScheduleSearchQueryBuilder {
         return this;
     }
 
-    public ScheduleSearchQueryBuilder setPrevLocation(String... prevLocation) {
+    public ScheduleSearchQueryBuilder setPrevLocation(String prevLocation) {
         this.prevLocation = prevLocation;
         return this;
     }
 
-    public ScheduleSearchQueryBuilder setNextLocation(String... nextLocation) {
+    public ScheduleSearchQueryBuilder setNextLocation(String nextLocation) {
         this.nextLocation = nextLocation;
         return this;
     }
@@ -98,10 +98,10 @@ class ScheduleSearchQueryBuilder {
         sql.append("origin_time, get_tiploc_name(destination), destination_time, mt.signal_id, mt.atoc_code ");
         sql.append(" from ").append(tableGroup.getMainTable()).append(" mt ")
                 .append(" JOIN ").append(tableGroup.getDetailTable()).append(" dt ON mt.suid=dt.suid ");
-        if(prevLocation!=null){
+        if(prevLocation!=null&&prevLocation.length()!=0){
             sql.append(" JOIN ").append(tableGroup.getDetailTable()).append(" pt ON mt.suid=pt.suid AND dt.seq > pt.seq");
         }
-        if(nextLocation!=null){
+        if(nextLocation!=null&&nextLocation.length()!=0){
             sql.append(" JOIN ").append(tableGroup.getDetailTable()).append(" nt ON mt.suid=nt.suid AND dt.seq < nt.seq");
         }
         sql.append(" where dt.tiploc_code IN (");
@@ -136,23 +136,15 @@ class ScheduleSearchQueryBuilder {
             }
             sql.append(")");
         }
-        if(prevLocation!=null){
+        if(prevLocation!=null&&prevLocation.length()!=0){
-            sql.append(" AND ( 1=0 ");
+            sql.append(" AND pt.tiploc_code IN (");
-            for(String prev:prevLocation){
+            appendLocationSearch(sql, params, prevLocation);
-                sql.append(" OR pt.tiploc_code IN (");
+            sql.append(") ");
-                appendLocationSearch(sql, params, prev);
-                sql.append(")");
-            }
-            sql.append(")");
         }
-        if(nextLocation!=null){
+        if(nextLocation!=null&&nextLocation.length()!=0){
-            sql.append(" AND ( 1=0 ");
+            sql.append(" AND nt.tiploc_code IN (");
-            for(String next:nextLocation){
+            appendLocationSearch(sql, params, nextLocation);
-                sql.append(" OR nt.tiploc_code IN (");
+            sql.append(") ");
-                appendLocationSearch(sql, params, next);
-                sql.append(")");
-            }
-            sql.append(")");
 
         }
         log.info(sql.toString());

src/main/resources/static/docs/schedule_search.html

@@ -9,13 +9,7 @@
 <body>
 <h1>Search train schedule by location</h1>
 <h2>Syntax</h2>
-<div class="syntax">/search/{location}[/{date}[/{time}]]?
+<div class="syntax">/search/{location}[/{date}[/{time}]]?[range={range}][&amp;strict={strict}][&amp;stopOnly={stopOnly}]</div>
-    [range={range}]
-    [&amp;strict={strict}]
-    [&amp;stopOnly={stopOnly}]
-    [&amp;previous={previous}]
-    [&amp;next={next}]
-</div>
 <h3>Parameters</h3>
 <table class="param">
     <tr>
@@ -70,25 +64,6 @@
             <span style="font-weight: bold">Optional.</span>
             Show only stopping trains. Valid valued are <code>true</code> or <code>false</code>. Default value is
             <code>false</code>.
-
-            This value will also affect the <code>previous</code> and <code>next</code> settings.
-        </td>
-    </tr>
-    <tr>
-        <th>previous</th>
-        <td>
-            <span style="font-weight: bold">Optional.</span>
-            Only show the train previously calls, or passing though the specified locations. The location is provided
-            in a comma separated list.
-        </td>
-    </tr>
-    <tr>
-        <th>previous</th>
-        <td>
-            <span style="font-weight: bold">Optional.</span>
-            Only show the train will also call, or passing though the specified locations. The location is provided
-            in a comma separated list.
-
         </td>
     </tr>
 </table>