[DAPS-1774] - Core, Python, Database, Foxx, Test add query end to end tests (#1779)

* [DAPS-1775] - fix: core, foxx, add missing {}, foxx query_router add params object schema to routes. (#1781)
* [DAPS-1777] - fix: foxx, user_router fix regression in missing response. (#1778)
* [DAPS-1786] - refactor: web tests, add test for hitting password reset. (#1787)
* [DAPS-1277] - fix: mock, core, common, PROXY_BASIC_ZMQ and PROXY_CUSTOM correctly defined
* [DAPS-1790] - fix: common, core, repo, zmq assertion failure during EXCEPT call due to callin zmq_msg with invalid state after closing it.
* [DAPS-1791] - fix: build, python client, requirements.txt was being moved to a folder named requirements.txt during cmake configure script.

Author: JoshuaSBrown

CMakeLists.txt

@@ -200,7 +200,7 @@ endif()
 
 if( BUILD_PYTHON_CLIENT )
   # make target = pydatafed
-  file(COPY ${PROJECT_SOURCE_DIR}/external/DataFedDependencies/python/datafed_pkg/requirements.txt DESTINATION ${PROJECT_SOURCE_DIR}/python/datafed_pkg/requirements.txt)
+  file(COPY ${PROJECT_SOURCE_DIR}/external/DataFedDependencies/python/datafed_pkg/requirements.txt DESTINATION ${PROJECT_SOURCE_DIR}/python/datafed_pkg/)
   add_subdirectory( python EXCLUDE_FROM_ALL )
 endif()
 

common/source/ServerFactory.cpp

@@ -1,6 +1,7 @@
 
 // Local private includes
 #include "servers/Proxy.hpp"
+#include "servers/ProxyBasicZMQ.hpp"
 
 // Local public includes
 #include "common/IServer.hpp"
@@ -39,7 +40,7 @@ std::unique_ptr<IServer> ServerFactory::create(
                       "been provided that will never be used!");
     }
     return std::unique_ptr<IServer>(
-        new Proxy(socket_options, socket_credentials, m_log_context));
+        new ProxyBasicZMQ(socket_options, socket_credentials, m_log_context));
   }
 
   EXCEPT_PARAM(1, "Error Server type unsupported");

common/source/communicators/ZeroMQCommunicator.cpp

@@ -378,10 +378,11 @@ void receiveBody(IMessage &msg, Buffer &buffer, ProtoBufFactory &factory,
     if (frame_size > 0) {
 
       if (zmq_msg_size(&zmq_msg) != frame_size) {
+	size_t msg_size = zmq_msg_size(&zmq_msg);
         zmq_msg_close(&zmq_msg);
         EXCEPT_PARAM(1, "RCV Invalid message body received. Expected: "
                             << frame_size
-                            << ", got: " << zmq_msg_size(&zmq_msg));
+                            << ", got: " << msg_size);
       }
 
       copyToBuffer(buffer, zmq_msg_data(&zmq_msg), frame_size);

core/database/foxx/api/query_router.js

@@ -66,8 +66,6 @@ router
 
                     g_lib.procInputParam(req.body, "title", false, obj);
 
-                    //console.log("qry/create filter:",obj.qry_filter);
-
                     var qry = g_db.q.save(obj, {
                         returnNew: true,
                     }).new;
@@ -124,7 +122,7 @@ router
                 qry_begin: joi.string().required(),
                 qry_end: joi.string().required(),
                 qry_filter: joi.string().allow("").required(),
-                params: joi.any().required(),
+                params: joi.object().required(),
                 limit: joi.number().integer().required(),
                 query: joi.any().required(),
             })
@@ -169,6 +167,7 @@ router
                     qry.qry_begin = req.body.qry_begin;
                     qry.qry_end = req.body.qry_end;
                     qry.qry_filter = req.body.qry_filter;
+
                     qry.params = req.body.params;
                     qry.limit = req.body.limit;
                     qry.query = req.body.query;
@@ -178,7 +177,6 @@ router
                         qry.params.cols = null;
                     }*/
 
-                    //console.log("qry/upd filter:",obj.qry_filter);
                     qry = g_db._update(qry._id, qry, {
                         mergeObjects: false,
                         returnNew: true,
@@ -231,7 +229,7 @@ router
                 qry_begin: joi.string().required(),
                 qry_end: joi.string().required(),
                 qry_filter: joi.string().allow("").required(),
-                params: joi.any().required(),
+                params: joi.object().required(),
                 limit: joi.number().integer().required(),
                 query: joi.any().required(),
             })
@@ -597,10 +595,6 @@ function execQuery(client, mode, published, orig_query) {
 
     qry += query.qry_end;
 
-    //console.log( "execqry" );
-    //console.log( "qry", qry );
-    //console.log( "params", query.params );
-
     // Enforce query paging limits
     if (query.params.cnt > g_lib.MAX_PAGE_SIZE) {
         query.params.cnt = g_lib.MAX_PAGE_SIZE;
@@ -725,7 +719,7 @@ router
 
             const query = {
                 ...req.body,
-                params: JSON.parse(req.body.params),
+                params: req.body.params,
             };
             results = execQuery(client, req.body.mode, req.body.published, query);
 
@@ -762,7 +756,7 @@ router
                 qry_begin: joi.string().required(),
                 qry_end: joi.string().required(),
                 qry_filter: joi.string().optional().allow(""),
-                params: joi.string().required(),
+                params: joi.object().required(),
                 limit: joi.number().integer().required(),
             })
             .required(),

core/server/CoreServer.cpp

@@ -241,7 +241,7 @@ void Server::msgRouter(LogContext log_context, int thread_count) {
   }
 
   ServerFactory server_factory(log_context);
-  auto proxy = server_factory.create(ServerType::PROXY_BASIC_ZMQ,
+  auto proxy = server_factory.create(ServerType::PROXY_CUSTOM,
                                      socket_options, socket_credentials);
 
   // Ceate worker threads
@@ -439,7 +439,7 @@ void Server::ioInsecure(LogContext log_context, int thread_count) {
     }
 
     ServerFactory server_factory(log_context);
-    auto proxy = server_factory.create(ServerType::PROXY_BASIC_ZMQ,
+    auto proxy = server_factory.create(ServerType::PROXY_CUSTOM,
                                        socket_options, socket_credentials);
 
     proxy->run();

core/server/DatabaseAPI.cpp

@@ -1308,7 +1308,7 @@ void DatabaseAPI::generalSearch(const Auth::SearchRequest &a_request,
   payload["qry_begin"] = qry_begin;
   payload["qry_end"] = qry_end;
   payload["qry_filter"] = qry_filter;
-  payload["params"] = "{" + params + "}";
+  payload["params"] = params;
   payload["limit"] = to_string(cnt);
 
   string body = payload.dump(-1, ' ', true);
@@ -3942,7 +3942,7 @@ uint32_t DatabaseAPI::parseSearchRequest(const Auth::SearchRequest &a_request,
   a_qry_begin = a_qry_begin;
   a_qry_end = a_qry_end;
   a_qry_filter = a_qry_filter;
-
+  a_params = "{" + a_params + "}";
   return cnt;
 }
 

tests/end-to-end/CMakeLists.txt

@@ -10,6 +10,7 @@ if( ENABLE_END_TO_END_API_TESTS )
   add_test(NAME end_to_end_alloc COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/test_api_alloc.py")
   add_test(NAME end_to_end_collection COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/test_api_collection.py")
   add_test(NAME end_to_end_record COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/test_api_record.py")
+  add_test(NAME end_to_end_query COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/test_api_query.py")
 
   # Note because these tests are all using the same database we cannot run most of them concurrently
   # They must be run sequentially so that concurrent API calls do not create problems
@@ -26,5 +27,7 @@ if( ENABLE_END_TO_END_API_TESTS )
   set_tests_properties(end_to_end_alloc PROPERTIES FIXTURES_SETUP FIX_ALLOC)
   set_tests_properties(end_to_end_collection PROPERTIES FIXTURES_REQUIRED FIX_ALLOC)
   set_tests_properties(end_to_end_record PROPERTIES FIXTURES_REQUIRED FIX_ALLOC)
+  set_tests_properties(end_to_end_record PROPERTIES FIXTURES_SETUP FIX_RECORD)
+  set_tests_properties(end_to_end_query PROPERTIES FIXTURES_REQUIRED FIX_RECORD)
 
 endif()