From 44332286eb9fc05b7751777abfa6d04c467b337a Mon Sep 17 00:00:00 2001 From: yaso-meth Date: Thu, 5 Sep 2024 09:37:30 +0200 Subject: [PATCH] Fix patient file api call issue --- .../components/builders/buildFilesList.dart | 44 ++++++------ Frontend/patient_manager/lib/pages/home.dart | 70 ------------------- 2 files changed, 20 insertions(+), 94 deletions(-) diff --git a/Frontend/patient_manager/lib/components/builders/buildFilesList.dart b/Frontend/patient_manager/lib/components/builders/buildFilesList.dart index 32b39991..bfab19c6 100644 --- a/Frontend/patient_manager/lib/components/builders/buildFilesList.dart +++ b/Frontend/patient_manager/lib/components/builders/buildFilesList.dart @@ -45,32 +45,28 @@ class _BuildFilesListState extends State { String fileUrl = ""; Future getFileUrlApiCall(String filePath) async { - if (AppEnviroment.getEnv() == "Dev") { - return "$basefile/mih/$filePath"; + var url = "$baseAPI/minio/pull/file/${AppEnviroment.getEnv()}/$filePath"; + //print(url); + var response = await http.get(Uri.parse(url)); + // print("here1"); + //print(response.statusCode); + + if (response.statusCode == 200) { + //print("here2"); + String body = response.body; + //print(body); + //print("here3"); + var decodedData = jsonDecode(body); + //print("Dedoced: ${decodedData['minioURL']}"); + + return decodedData['minioURL']; + //AppUser u = AppUser.fromJson(decodedData); + // print(u.email); + //return "AlometThere"; } else { - var url = "$baseAPI/minio/pull/file/$filePath/prod"; - //print(url); - var response = await http.get(Uri.parse(url)); - // print("here1"); - //print(response.statusCode); - - if (response.statusCode == 200) { - //print("here2"); - String body = response.body; - //print(body); - //print("here3"); - var decodedData = jsonDecode(body); - //print("Dedoced: ${decodedData['minioURL']}"); - - return decodedData['minioURL']; - //AppUser u = AppUser.fromJson(decodedData); - // print(u.email); - //return "AlometThere"; - } else { - throw Exception( - "Error: GetUserData status code ${response.statusCode}"); - } + throw Exception("Error: GetUserData status code ${response.statusCode}"); } + //print(url); // var response = await http.get(Uri.parse(url)); // // print("here1"); diff --git a/Frontend/patient_manager/lib/pages/home.dart b/Frontend/patient_manager/lib/pages/home.dart index 95497542..b37157e9 100644 --- a/Frontend/patient_manager/lib/pages/home.dart +++ b/Frontend/patient_manager/lib/pages/home.dart @@ -98,76 +98,6 @@ class _HomeState extends State { return HomeArguments(userData, bUserData, busData, userPic); } - Future getUserDetails() async { - //print("pat man drawer: " + endpointUserData + widget.userEmail); - var uid = await SuperTokens.getUserId(); - var response = await http.get(Uri.parse("$baseAPI/user/$uid")); - - // print(response.statusCode); - // print(response.body); - if (response.statusCode == 200) { - // print("here"); - String body = response.body; - var decodedData = jsonDecode(body); - AppUser u = AppUser.fromJson(decodedData); - // print(u.email); - //setState(() { - //_widgetOptions = setLayout(u); - //}); - return u; - } else { - throw Exception("Error: GetUserData status code ${response.statusCode}"); - } - } - - Future getBusinessUserDetails() async { - var uid = await SuperTokens.getUserId(); - var response = await http.get(Uri.parse("$baseAPI/business-user/$uid")); - if (response.statusCode == 200) { - String body = response.body; - var decodedData = jsonDecode(body); - BusinessUser business_User = BusinessUser.fromJson(decodedData); - return business_User; - } else { - return null; - } - } - - Future getBusinessDetails() async { - var uid = await SuperTokens.getUserId(); - var response = await http.get(Uri.parse("$baseAPI/business/app_id/$uid")); - if (response.statusCode == 200) { - String body = response.body; - var decodedData = jsonDecode(body); - Business business = Business.fromJson(decodedData); - return business; - } else { - return null; - } - } - - Future getFileUrlApiCall(AppUser signedInUser) async { - if (signedInUser.pro_pic_path == "") { - return ""; - } else if (AppEnviroment.getEnv() == "Dev") { - return "${AppEnviroment.baseFileUrl}/mih/${signedInUser.pro_pic_path}"; - } else { - var url = - "${AppEnviroment.baseApiUrl}/minio/pull/file/${signedInUser.pro_pic_path}/prod"; - var response = await http.get(Uri.parse(url)); - - if (response.statusCode == 200) { - String body = response.body; - var decodedData = jsonDecode(body); - - return decodedData['minioURL']; - } else { - throw Exception( - "Error: GetUserData status code ${response.statusCode}"); - } - } - } - @override void dispose() { // TODO: implement dispose