jens/flipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Isolate duplicated code in DatabasesManager.

Browse Source 
Reviewed By: lblasa

Differential Revision: D48316900

fbshipit-source-id: 2ae984f0d6f10b9cb843a74f335c77428d2229ef
This commit is contained in:
Fúlvio Abrahão de Paula
2023-08-14 11:07:07 -07:00
committed by Facebook GitHub Bot
parent d102ae263c
commit 661ed9eb44
1 changed files with 22 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
iOS/Plugins/FlipperKitDatabasesPlugin/FlipperKitDatabasesPlugin/DatabasesManager.m
View File

@@ -91,19 +91,13 @@
DatabaseGetTableDataRequest* request = [DatabaseGetTableDataRequest DatabaseGetTableDataRequest* request = [DatabaseGetTableDataRequest
getTableDataRequestFromDictionary:params]; getTableDataRequestFromDictionary:params];
if (!request) { if (!request) {
NSDictionary* errorResponse = [ObjectMapper [DatabasesManager raiseInvalidRequestError:responder];
errorWithCode:DatabasesErrorCodesInvalidRequest
message:kDatabasesErrorCodesInvalidRequestMessage];
[responder error:errorResponse];
return; return;
} }
DatabaseDescriptorHolder* descriptorHolder = DatabaseDescriptorHolder* descriptorHolder =
self.databaseDescriptorHolders[@(request.databaseId)]; self.databaseDescriptorHolders[@(request.databaseId)];
if (!descriptorHolder) { if (!descriptorHolder) {
NSDictionary* errorResponse = [ObjectMapper [DatabasesManager raiseDatabaseInvalidError:responder];
errorWithCode:DatabasesErrorCodesDatabaseInvalid
message:kDatabasesErrorCodesDatabaseInvalidMessage];
[responder error:errorResponse];
return; return;
} }
@@ -137,20 +131,13 @@
getTableStructureRequestFromDictionary:params]; getTableStructureRequestFromDictionary:params];
if (!request) { if (!request) {
NSDictionary* errorResponse = [ObjectMapper [DatabasesManager raiseInvalidRequestError:responder];
errorWithCode:DatabasesErrorCodesInvalidRequest
message:kDatabasesErrorCodesInvalidRequestMessage];
[responder error:errorResponse];
return; return;
} }
DatabaseDescriptorHolder* descriptorHolder = DatabaseDescriptorHolder* descriptorHolder =
self.databaseDescriptorHolders[@(request.databaseId)]; self.databaseDescriptorHolders[@(request.databaseId)];
if (!descriptorHolder) { if (!descriptorHolder) {
NSDictionary* errorResponse = [ObjectMapper [DatabasesManager raiseDatabaseInvalidError:responder];
errorWithCode:DatabasesErrorCodesDatabaseInvalid
message:kDatabasesErrorCodesDatabaseInvalidMessage];
[responder error:errorResponse];
return; return;
} }
@@ -178,19 +165,13 @@
DatabaseGetTableInfoRequest* request = [DatabaseGetTableInfoRequest DatabaseGetTableInfoRequest* request = [DatabaseGetTableInfoRequest
getTableInfoRequestFromDictionary:params]; getTableInfoRequestFromDictionary:params];
if (!request) { if (!request) {
NSDictionary* errorResponse = [ObjectMapper [DatabasesManager raiseInvalidRequestError:responder];
errorWithCode:DatabasesErrorCodesInvalidRequest
message:kDatabasesErrorCodesInvalidRequestMessage];
[responder error:errorResponse];
return; return;
} }
DatabaseDescriptorHolder* descriptorHolder = DatabaseDescriptorHolder* descriptorHolder =
self.databaseDescriptorHolders[@(request.databaseId)]; self.databaseDescriptorHolders[@(request.databaseId)];
if (!descriptorHolder) { if (!descriptorHolder) {
NSDictionary* errorResponse = [ObjectMapper [DatabasesManager raiseDatabaseInvalidError:responder];
errorWithCode:DatabasesErrorCodesDatabaseInvalid
message:kDatabasesErrorCodesDatabaseInvalidMessage];
[responder error:errorResponse];
return; return;
} }
@@ -218,19 +199,13 @@
DatabaseExecuteSqlRequest* request = [DatabaseExecuteSqlRequest DatabaseExecuteSqlRequest* request = [DatabaseExecuteSqlRequest
getExecuteSqlRequestFromDictionary:params]; getExecuteSqlRequestFromDictionary:params];
if (!request) { if (!request) {
NSDictionary* errorResponse = [ObjectMapper [DatabasesManager raiseInvalidRequestError:responder];
errorWithCode:DatabasesErrorCodesInvalidRequest
message:kDatabasesErrorCodesInvalidRequestMessage];
[responder error:errorResponse];
return; return;
} }
DatabaseDescriptorHolder* descriptorHolder = DatabaseDescriptorHolder* descriptorHolder =
self.databaseDescriptorHolders[@(request.databaseId)]; self.databaseDescriptorHolders[@(request.databaseId)];
if (!descriptorHolder) { if (!descriptorHolder) {
NSDictionary* errorResponse = [ObjectMapper [DatabasesManager raiseDatabaseInvalidError:responder];
errorWithCode:DatabasesErrorCodesDatabaseInvalid
message:kDatabasesErrorCodesDatabaseInvalidMessage];
[responder error:errorResponse];
return; return;
} }
@try { @try {
@@ -249,4 +224,18 @@
}]; }];
} }
+ (void)raiseInvalidRequestError:(id<FlipperResponder>)responder {
NSDictionary* errorResponse =
[ObjectMapper errorWithCode:DatabasesErrorCodesInvalidRequest
message:kDatabasesErrorCodesInvalidRequestMessage];
[responder error:errorResponse];
}
+ (void)raiseDatabaseInvalidError:(id<FlipperResponder>)responder {
NSDictionary* errorResponse =
[ObjectMapper errorWithCode:DatabasesErrorCodesDatabaseInvalid
message:kDatabasesErrorCodesDatabaseInvalidMessage];
[responder error:errorResponse];
}
@end @end