From 652397ee47d584b7e9a5d2fd9c3578f337a0ead6 Mon Sep 17 00:00:00 2001 From: Irusha Vidanamadura Date: Mon, 20 Feb 2023 06:52:34 -0800 Subject: [PATCH] Revert "[23] Extend FIND_RECORDS to find by ID (#62)" (#67) This reverts commit 45f93350fc6e932946e69d39b87c969e9bf4f52b. --- .../ADMIN/API-Test/GLOBL-GET_GEO_LIST.yaml | 242 ------------------ .../ADMIN/API-Test/GLOBL-GET_GEO_NAME.yaml | 127 --------- .../BIOMD/API-Test/BIOMD-CREATE_RECORD.yaml | 235 ----------------- .../api/BIOMD/API-Test/BIOMD-FIND_RECORD.yaml | 162 ------------ src/api/api/BIOMD/BIOMD.js | 4 - src/api/api/BIOMD/api-design.md | 223 ---------------- 6 files changed, 993 deletions(-) delete mode 100644 src/api/api/ADMIN/API-Test/GLOBL-GET_GEO_LIST.yaml delete mode 100644 src/api/api/ADMIN/API-Test/GLOBL-GET_GEO_NAME.yaml delete mode 100644 src/api/api/BIOMD/API-Test/BIOMD-CREATE_RECORD.yaml delete mode 100644 src/api/api/BIOMD/API-Test/BIOMD-FIND_RECORD.yaml delete mode 100644 src/api/api/BIOMD/api-design.md diff --git a/src/api/api/ADMIN/API-Test/GLOBL-GET_GEO_LIST.yaml b/src/api/api/ADMIN/API-Test/GLOBL-GET_GEO_LIST.yaml deleted file mode 100644 index d364fe0..0000000 --- a/src/api/api/ADMIN/API-Test/GLOBL-GET_GEO_LIST.yaml +++ /dev/null @@ -1,242 +0,0 @@ -GLOBL: - GLOBL01: - TESTNAME: "GLOBAL GET_GEO_LIST" - ACTION: "WS" - TYPE: "REQUEST" - Description: "Test Country list" - INPUT: - { - Expiry: "20000", - Type: "REQUEST", - Request: - { - Module: "GLOBAL", - ServiceCode: "GLOBL", - API: "GET_GEO_LIST", - Max_List: 5, - Criteria: { - Type_Code: "CNTY", - Loci_Name_Country : '' - } - }, - } - OUTPUT: - { - Expiry: "20000", - Type: "RESPONSE", - Response: - { - Country_List: - [ - { - Type_Code: "CNTY", - Loci_Name_Country: "India", - Loci_Code_Country: "IND", - - }, - { - Type_Code: "CNTY", - Loci_Name_Country: "Armenia", - Loci_Code_Country: "ARM" - } - ] - - } - - } - MEDIA: false - USERVERIFY: false - - GLOBL02: - TESTNAME: "GLOBAL GET_GEO_LIST" - ACTION: "WS" - TYPE: "REQUEST" - Description: "Test converstion of Country Code to Name" - INPUT: - { - Expiry: "20000", - Type: "REQUEST", - Request: - { - Module: "GLOBAL", - ServiceCode: "GLOBL", - API: "GET_GEO_LIST", - Max_List: 5, - Criteria: { - Type_Code: "CNTY", - Loci_Name_Country : "Ind" - } - }, - } - OUTPUT: - { - Expiry: "20000", - Type: "RESPONSE", - Response: - { - Country_List: - - [ - { - Type_Code: "CNTY", - Loci_Name_Country: "India", - Loci_Code_Country: "IND", - - }, - { - Type_Code: "CNTY", - Loci_Name_Country: "Indonesia", - Loci_Code_Country: "IDN" - } - ] - - } - - } - MEDIA: false - USERVERIFY: false - - GLOBL03: - TESTNAME: "GLOBAL GET_GEO_LIST" - ACTION: "WS" - TYPE: "REQUEST" - Description: "Test converstion of District ( ARL1 ) Code to Name" - INPUT: - { - Expiry: "20000", - Type: "REQUEST", - Request: - { - Module: "GLOBAL", - ServiceCode: "GLOBL", - API: "GET_GEO_LIST", - Max_List: 5, - Criteria: { - Type_Code: "STATE", - Loci_Code_Country : "IND", - Loci_Name_State : "Andh" - } - }, - } - OUTPUT: - { - Expiry: "20000", - Type: "RESPONSE", - Response: { - State_List: - [ - { - Type_Code: "STATE", - Loci_Name_State: "Andra Pradesh", - Loci_Code_State: "AP", - }, - { - Type_Code: "STATE", - Loci_Name_State: "Andaman and Nicobar Islands", - Loci_Code_State: "AN" - } - ] - } - - } - MEDIA: false - USERVERIFY: false - - GLOBL04: - TESTNAME: "GLOBAL GET_GEO_LIST" - ACTION: "WS" - TYPE: "REQUEST" - Description: "Test converstion of City ( ARL2 ) Code to Name" - INPUT: - { - Expiry: "20000", - Type: "REQUEST", - Request: - { - Module: "GLOBAL", - ServiceCode: "GLOBL", - API: "GET_GEO_LIST", - Max_List: 5, - Criteria: { - Type_Code: "ARL1", - Loci_Code_Country : "IND", - Loci_Code_State : "AP", - Loci_Name_District: "Chit" - } - }, - } - OUTPUT: - { - Expiry: "20000", - Type: "RESPONSE", - Response: { - District_List: - - [ - { - Type_Code: "ARL1", - Loci_Name_District: "Chittoor", - Loci_Code_District: "Chittoor", - }, - { - Type_Code: "ARL1", - Loci_Name_District: "Chittoor", - Loci_Code_District: "Chittoor" - } - ] - - } - - } - MEDIA: false - USERVERIFY: false - - GLOBL05: - TESTNAME: "GLOBAL GET_GEO_LIST" - ACTION: "WS" - TYPE: "REQUEST" - Description: "Test converstion of City ( ARL2 ) Code to Name" - INPUT: - { - Expiry: "20000", - Type: "REQUEST", - Request: - { - Module: "GLOBAL", - ServiceCode: "GLOBL", - API: "GET_GEO_LIST", - Max_List: 5, - Criteria: { - Type_Code: "ARL2", - Loci_Code_Country : "IND", - Loci_Code_State : "AP", - Loci_Code_District: "Chittoor", - Loci_Name_City: “Tir” - } - }, - } - OUTPUT: - { - Expiry: "20000", - Type: "RESPONSE", - Response: { - Manddal_List: - [ - { - Type_Code: "ARL2", - Loci_Name_Mandal: "Tirupati", - Loci_Code_Mandal: "06E2", - Loci_Postal_Code: "517501" - }, - { - Type_Code: "ARL2", - Loci_Name_Mandal: "Tirumala", - Loci_Code_Mandal: "06DE", - Loci_Postal_Code: "517504" - } - ] - } - - } - MEDIA: false - USERVERIFY: false \ No newline at end of file diff --git a/src/api/api/ADMIN/API-Test/GLOBL-GET_GEO_NAME.yaml b/src/api/api/ADMIN/API-Test/GLOBL-GET_GEO_NAME.yaml deleted file mode 100644 index 02fa632..0000000 --- a/src/api/api/ADMIN/API-Test/GLOBL-GET_GEO_NAME.yaml +++ /dev/null @@ -1,127 +0,0 @@ -GLOBL: - GLOBL01: - TESTNAME: "GLOBAL GET_GEO_NAME" - ACTION: "WS" - TYPE: "REQUEST" - Description: "Test converstion of Country Code to Name" - INPUT: - { - Expiry: "20000", - Type: "REQUEST", - Request: - { - ServiceCode: "GLOBL", - API: "GET_GEO_NAME", - Type_Code: 'CNTY', - Loci_Code_Country: 'IND', - }, - } - OUTPUT: - { - Expiry: "20000", - Type: "RESPONSE", - Response: { - Loci_Name_Country: 'India' - } - - } - MEDIA: false - USERVERIFY: false - - GLOBL02: - TESTNAME: "GLOBAL GET_GEO_NAME" - ACTION: "WS" - TYPE: "REQUEST" - Description: "Test converstion of State Code to Name" - INPUT: - { - Expiry: "20000", - Type: "REQUEST", - Request: - { - ServiceCode: "GLOBL", - API: "GET_GEO_NAME", - Type_Code: "STATE", - Loci_Code_Country: "IND", - Loci_Code_State: "TN" - }, - } - OUTPUT: - { - Expiry: "20000", - Type: "RESPONSE", - Response: { - Loci_Name_State : "Tamil Nadu" - } - - } - MEDIA: false - USERVERIFY: false - - GLOBL03: - TESTNAME: "GLOBAL GET_GEO_NAME" - ACTION: "WS" - TYPE: "REQUEST" - Description: "Test converstion of District ( ARL1 ) Code to Name" - INPUT: - { - Expiry: "20000", - Type: "REQUEST", - Request: - { - ServiceCode: "GLOBL", - API: "GET_GEO_NAME", - Type_Code: "ARL1", - Loci_Code_Country: "IND", - Loci_Code_State: "AP", - Loci_Code_Area_L1: "503" - }, - } - OUTPUT: - { - Expiry: "20000", - Type: "RESPONSE", - Response: { - Type_Code: "ARL1", - Loci_Name_Area_L1: "Chittoor", - Loci_Code_Area_L1: "503" - } - - } - MEDIA: false - USERVERIFY: false - - GLOBL04: - TESTNAME: "GLOBAL GET_GEO_NAME" - ACTION: "WS" - TYPE: "REQUEST" - Description: "Test converstion of City ( ARL2 ) Code to Name" - INPUT: - { - Expiry: "20000", - Type: "REQUEST", - Request: - { - ServiceCode: "GLOBL", - API: "GET_GEO_NAME", - Type_Code: "ARL2", - Loci_Code_Country: "IND", - Loci_Code_State: "AP", - Loci_Code_Area_L1: "503", - Loci_Code_Area_L2 : "071E" - }, - } - OUTPUT: - { - Expiry: "20000", - Type: "RESPONSE", - Response: { - Type_Code: "ARL2", - Loci_Name_Area_L2: "Vijayapuram", - Loci_Code_Area_L2: "071E", - Loci_Postal_Code: "517586" - } - - } - MEDIA: false - USERVERIFY: false \ No newline at end of file diff --git a/src/api/api/BIOMD/API-Test/BIOMD-CREATE_RECORD.yaml b/src/api/api/BIOMD/API-Test/BIOMD-CREATE_RECORD.yaml deleted file mode 100644 index bef31ec..0000000 --- a/src/api/api/BIOMD/API-Test/BIOMD-CREATE_RECORD.yaml +++ /dev/null @@ -1,235 +0,0 @@ -BIOMD: - BIOMD01: - TESTNAME: "Create Manufacturer Record" - ACTION: "WS" - TYPE: "REQUEST" - Description: "Testing Create_Record API" - INPUT: - { - Expiry: "20000", - Type: "REQUEST", - Request: - { - Module: "MEMS", - ServiceCode: "BIOMD", - API: "CREATE_RECORD", - collection: "Manufacturer", - record: - { - manufacturer_name: "General Electric", - country: "United States of America", - area: "California", - city: "San Jose", - address_1: "5 Necco St, Boston", - address_2: "Unit 223", - area_code: "95110", - }, - }, - } - OUTPUT: - { - Type: "RESPONSE", - Response: { success: true, message: "Created Manufacturer Record" }, - } - MEDIA: false - USERVERIFY: false - - BIOMD02: - TESTNAME: "Create Vendor Record" - ACTION: "WS" - TYPE: "REQUEST" - Description: "Testing Create_Record API" - INPUT: - { - Expiry: "20000", - Type: "REQUEST", - Request: - { - Module: "MEMS", - ServiceCode: "BIOMD", - API: "CREATE_RECORD", - collection: "Vendor", - record: - { - vendor_name: "GE Distributor", - country: "Canada", - area: "Ontario", - city: "Toronto", - address1: "15 Yonge Street", - address2: "Unit 234", - areaCode: "M2K0K2", - siteID: 824, - Contacts: " ", - manufacturer_ID: ["MF01", "MF32"], - }, - }, - } - OUTPUT: - { - Type: "RESPONSE", - Response: { success: true, message: "Created Vendor Record" }, - } - MEDIA: false - USERVERIFY: false - - BIOMD03: - TESTNAME: "Create Facility Record" - ACTION: "WS" - TYPE: "REQUEST" - Description: "Testing Create_Record API" - INPUT: - { - Expiry: "20000", - Type: "REQUEST", - Request: - { - Module: "MEMS", - ServiceCode: "BIOMD", - API: "CREATE_RECORD", - collection: "Manufacturer", - record: - { - facility_name: "Ghana Medical Clinic", - country: "United States of America", - area: "California", - city: "San Jose", - address_1: "5 Necco St, Boston", - address_2: "Unit 223", - area_code: "95110", - location: { longitude: -73.974, latitude: 40.764 }, - departments: ["Family Medicine", "Out Patient", "Pediatrics"], - }, - }, - } - OUTPUT: - { - Type: "RESPONSE", - Response: { success: true, message: "Created Manufacturer Record" }, - } - MEDIA: false - USERVERIFY: false - - BIOMD04: - TESTNAME: "Create Model Record" - ACTION: "WS" - TYPE: "REQUEST" - Description: "Testing Create_Record API" - INPUT: - { - Expiry: "20000", - Type: "REQUEST", - Request: - { - Module: "MEMS", - ServiceCode: "BIOMD", - API: "CREATE_RECORD", - collection: "Model", - record: - { - model_name: "MX 800", - model_number: 800, - vendor_id, - vendor_site_id: "A5422", - contact_id: [], - }, - }, - } - OUTPUT: - { - Type: "RESPONSE", - Response: { success: true, message: "Created Model Record" }, - } - MEDIA: false - USERVERIFY: false - - BIOMD05: - TESTNAME: "Create Contact Record" - ACTION: "WS" - TYPE: "REQUEST" - Description: "Testing Create_Record API" - INPUT: - { - Expiry: "20000", - Type: "REQUEST", - Request: - { - Module: "MEMS", - ServiceCode: "BIOMD", - API: "CREATE_RECORD", - collection: "Contact", - record: - { - name: "Ben Jose", - email: "ben.jose@example.com", - contact: - [ - { - areaCode: 001, - number: 41583493405, - type: "Emergency" - }, - { - areaCode: 001, - number: 41583493405, - type: "General Line", - }, - ], - }, - }, - } - OUTPUT: - { - Type: "RESPONSE", - Response: { success: true, message: "Created Contact Record" }, - } - MEDIA: false - USERVERIFY: false - - BIOMD06: - TESTNAME: "Create Asset Record" - ACTION: "WS" - TYPE: "REQUEST" - Description: "Testing Create_Record API" - INPUT: - { - Expiry: "20000", - Type: "REQUEST", - Request: - { - Module: "MEMS", - ServiceCode: "BIOMD", - API: "CREATE_RECORD", - collection: "Asset", - record: - { - _id: " ", - manufacturer_id: " ", - facility_id: " ", - vendor_id: " ", - model_id: " ", - assetCode: "A4F05", - description: "Test Description", - commonName: "Patient Monitor", - serialNumber: "123498275895RS", - manufacturerDate: 1664757154000, - roomTag: "A329", - supportTeam: " ", - status: "ACTIVE", - user_manual: " ", - technical_manual: " ", - purchaseOrderNumber: 12456, - projectTag: "Capital012", - purchaseCost: 1204.34, - purchaseDate: 1664757154000, - acceptanceDate: 1664757154000, - generalComment: "Working Great", - }, - }, - } - OUTPUT: - { - Type: "RESPONSE", - Response: { success: true, message: "Created Asset Record" }, - } - MEDIA: false - USERVERIFY: false diff --git a/src/api/api/BIOMD/API-Test/BIOMD-FIND_RECORD.yaml b/src/api/api/BIOMD/API-Test/BIOMD-FIND_RECORD.yaml deleted file mode 100644 index a5c9113..0000000 --- a/src/api/api/BIOMD/API-Test/BIOMD-FIND_RECORD.yaml +++ /dev/null @@ -1,162 +0,0 @@ -BIOMD: - BIOMD01: - TESTNAME: "FIND_RECORD Substring Match" - ACTION: "WS" - TYPE: "REQUEST" - Description: "Search Manufacturer Starting with Gen" - INPUT: - { - Expiry: "20000", - Type: "REQUEST", - Request: - { - Module: "MEMS", - ServiceCode: "BIOMD", - API: "FIND_RECORD", - return_array: true, - max_list: 5, - find: - { - collection: "Manufacturer", - queries: [{ - field: "manufacturer_name", - op: "sb", - value: "^Gen", - }], - - projection: { - _id: 0, - manufacturer_name: 1, - country: 1, - Area: 1, - City: 1, - Address1: 1, - Address2: 1, - AreaCode: 1, - }, - }, - }, - } - OUTPUT: - { - - } - MEDIA: false - USERVERIFY: false - - BIOMD02: - TESTNAME: "FIND_RECORD Substring Match" - ACTION: "WS" - TYPE: "REQUEST" - Description: "Get All Manufacturer" - INPUT: - { - Expiry: "20000", - Type: "REQUEST", - Request: - { - Module: "MEMS", - ServiceCode: "BIOMD", - API: "FIND_RECORD", - return_array: true, - max_list: 5, - find: - { - collection: "Manufacturer", - queries: [{ - field: "manufacturer_name", - op: "sb", - value: "^", - }], - - projection: { - _id: 0, - manufacturer_name: 1, - }, - }, - }, - } - OUTPUT: - { - - } - MEDIA: false - USERVERIFY: false - - BIOMD03: - TESTNAME: "FIND_RECORD Substring Match" - ACTION: "WS" - TYPE: "REQUEST" - Description: "Exact Match Vendor based on Manufacturer" - INPUT: - { - Expiry: "20000", - Type: "REQUEST", - Request: - { - Module: "MEMS", - ServiceCode: "BIOMD", - API: "FIND_RECORD", - return_array: true, - max_list: 5, - find: - { - collection: "Model", - queries: [{ - field: "vendor_id", - op: "eq", - value: "635187e7be1e8400127667e4", - }], - - projection: { - _id: 0, - model_name: 1, - model_number: 1, - }, - }, - }, - } - OUTPUT: - { - - } - MEDIA: false - USERVERIFY: false - - BIOMD04: - TESTNAME: "FIND_RECORD Substring Match" - ACTION: "WS" - TYPE: "REQUEST" - Description: "Find Manufacturer based on _ID" - INPUT: - { - Expiry: "20000", - Type: "REQUEST", - Request: - { - Module: "MEMS", - ServiceCode: "BIOMD", - API: "FIND_RECORD", - return_array: true, - max_list: 5, - find: - { - collection: "Manufacturer", - queries: [{ - op: "eq_id", - value: "62ae5565ee3033c4977ea00d", - }], - - projection: { - _id: 1, - ManufacturerName: 1 - }, - }, - }, - } - OUTPUT: - { - - } - MEDIA: false - USERVERIFY: false \ No newline at end of file diff --git a/src/api/api/BIOMD/BIOMD.js b/src/api/api/BIOMD/BIOMD.js index c3de77c..1883a32 100644 --- a/src/api/api/BIOMD/BIOMD.js +++ b/src/api/api/BIOMD/BIOMD.js @@ -11,7 +11,6 @@ //Required Libs // const { join } = require("path"); // const media = require(join(CONFIG.Paths.HomeDir, CONFIG.Paths.API, "GLOBAL", "media")); -const {ObjectId} = require('mongodb'); const instituteCode = CONFIG.Database.Site_Database.Name; //Application Info @@ -213,9 +212,6 @@ module.exports.FIND_RECORD = async function (req, dbClient) { let qry = queries[i] if (isValidOperator(qry.op)) { switch (qry.op) { - case "eq_id": - createdFindQuery["_id"] = ObjectId(qry.value); - break; case "eq": createdFindQuery[qry.field] = qry.value; break; diff --git a/src/api/api/BIOMD/api-design.md b/src/api/api/BIOMD/api-design.md deleted file mode 100644 index 2e068bc..0000000 --- a/src/api/api/BIOMD/api-design.md +++ /dev/null @@ -1,223 +0,0 @@ -# BIOMD Api Reference - -## Purpose -The purpose of this document is to outline the public interface for the BIOMD API - -## References -- - -## Accoronyms & Definitions -- - -## API Design - -Every Request is sent as a JSON-compliant object. The following is the standard used for sending requests: -```json -{ - "Expiry": 0000, - "Type": "Request", - "Request": { - "Module": "", - "ServiceCode": "", - "API": "", -