fix: review changes

This commit is contained in:
DenserMeerkat
2023-12-22 20:25:26 +05:30
parent aceb4c9b01
commit 06f8cd7f02
14 changed files with 104 additions and 110 deletions

View File

@ -1,7 +1,7 @@
import 'package:apidash/utils/convert_utils.dart';
import 'package:flutter/foundation.dart';
import 'package:apidash/consts.dart';
import 'package:apidash/utils/utils.dart' show mapToRows, rowsToMap;
import 'package:apidash/utils/utils.dart'
show mapToRows, rowsToMap, getEnabledRows;
import 'name_value_model.dart';
import 'response_model.dart';
@ -16,8 +16,8 @@ class RequestModel {
this.requestTabIndex = 0,
this.requestHeaders,
this.requestParams,
this.enabledHeaders,
this.enabledParams,
this.isHeaderEnabledList,
this.isParamEnabledList,
this.requestBodyContentType = ContentType.json,
this.requestBody,
this.responseStatus,
@ -33,18 +33,25 @@ class RequestModel {
final int requestTabIndex;
final List<NameValueModel>? requestHeaders;
final List<NameValueModel>? requestParams;
final List<bool>? enabledHeaders;
final List<bool>? enabledParams;
final List<bool>? isHeaderEnabledList;
final List<bool>? isParamEnabledList;
final ContentType requestBodyContentType;
final String? requestBody;
final int? responseStatus;
final String? message;
final ResponseModel? responseModel;
Map<String, String> get headersMap =>
rowsToMap(getEnabledRows(requestHeaders, enabledHeaders)) ?? {};
Map<String, String> get paramsMap =>
rowsToMap(getEnabledRows(requestParams, enabledParams)) ?? {};
List<NameValueModel>? get enabledRequestHeaders =>
getEnabledRows(requestHeaders, isHeaderEnabledList);
List<NameValueModel>? get enabledRequestParams =>
getEnabledRows(requestParams, isParamEnabledList);
Map<String, String> get enabledHeadersMap =>
rowsToMap(enabledRequestHeaders) ?? {};
Map<String, String> get enabledParamsMap =>
rowsToMap(enabledRequestParams) ?? {};
Map<String, String> get headersMap => rowsToMap(requestHeaders) ?? {};
Map<String, String> get paramsMap => rowsToMap(requestParams) ?? {};
RequestModel duplicate({
required String id,
@ -57,8 +64,10 @@ class RequestModel {
description: description,
requestHeaders: requestHeaders != null ? [...requestHeaders!] : null,
requestParams: requestParams != null ? [...requestParams!] : null,
enabledHeaders: enabledHeaders != null ? [...enabledHeaders!] : null,
enabledParams: enabledParams != null ? [...enabledParams!] : null,
isHeaderEnabledList:
isHeaderEnabledList != null ? [...isHeaderEnabledList!] : null,
isParamEnabledList:
isParamEnabledList != null ? [...isParamEnabledList!] : null,
requestBodyContentType: requestBodyContentType,
requestBody: requestBody,
);
@ -73,8 +82,8 @@ class RequestModel {
int? requestTabIndex,
List<NameValueModel>? requestHeaders,
List<NameValueModel>? requestParams,
List<bool>? enabledHeaders,
List<bool>? enabledParams,
List<bool>? isHeaderEnabledList,
List<bool>? isParamEnabledList,
ContentType? requestBodyContentType,
String? requestBody,
int? responseStatus,
@ -83,8 +92,8 @@ class RequestModel {
}) {
var headers = requestHeaders ?? this.requestHeaders;
var params = requestParams ?? this.requestParams;
var eHeaders = enabledHeaders ?? this.enabledHeaders;
var eParams = enabledParams ?? this.enabledParams;
var enabledHeaders = isHeaderEnabledList ?? this.isHeaderEnabledList;
var enabledParams = isParamEnabledList ?? this.isParamEnabledList;
return RequestModel(
id: id ?? this.id,
method: method ?? this.method,
@ -94,8 +103,8 @@ class RequestModel {
requestTabIndex: requestTabIndex ?? this.requestTabIndex,
requestHeaders: headers != null ? [...headers] : null,
requestParams: params != null ? [...params] : null,
enabledHeaders: eHeaders != null ? [...eHeaders] : null,
enabledParams: eParams != null ? [...eParams] : null,
isHeaderEnabledList: enabledHeaders != null ? [...enabledHeaders] : null,
isParamEnabledList: enabledParams != null ? [...enabledParams] : null,
requestBodyContentType:
requestBodyContentType ?? this.requestBodyContentType,
requestBody: requestBody ?? this.requestBody,
@ -121,8 +130,8 @@ class RequestModel {
final description = data["description"] as String?;
final requestHeaders = data["requestHeaders"];
final requestParams = data["requestParams"];
final enabledHeaders = data["enabledHeaders"] as List<bool>?;
final enabledParams = data["enabledParams"] as List<bool>?;
final isHeaderEnabledList = data["isHeaderEnabledList"] as List<bool>?;
final isParamEnabledList = data["isParamEnabledList"] as List<bool>?;
try {
requestBodyContentType =
ContentType.values.byName(data["requestBodyContentType"] as String);
@ -153,8 +162,8 @@ class RequestModel {
requestParams: requestParams != null
? mapToRows(Map<String, String>.from(requestParams))
: null,
enabledHeaders: enabledHeaders,
enabledParams: enabledParams,
isHeaderEnabledList: isHeaderEnabledList,
isParamEnabledList: isParamEnabledList,
requestBodyContentType: requestBodyContentType,
requestBody: requestBody,
responseStatus: responseStatus,
@ -172,8 +181,8 @@ class RequestModel {
"description": description,
"requestHeaders": rowsToMap(requestHeaders),
"requestParams": rowsToMap(requestParams),
"enabledHeaders": enabledHeaders,
"enabledParams": enabledParams,
"isHeaderEnabledList": isHeaderEnabledList,
"isParamEnabledList": isParamEnabledList,
"requestBodyContentType": requestBodyContentType.name,
"requestBody": requestBody,
"responseStatus": includeResponse ? responseStatus : null,
@ -192,9 +201,9 @@ class RequestModel {
"Request Description: $description",
"Request Tab Index: ${requestTabIndex.toString()}",
"Request Headers: ${requestHeaders.toString()}",
"Enabled Headers: ${enabledHeaders.toString()}",
"Enabled Headers: ${isHeaderEnabledList.toString()}",
"Request Params: ${requestParams.toString()}",
"Enabled Params: ${enabledParams.toString()}",
"Enabled Params: ${isParamEnabledList.toString()}",
"Request Body Content Type: ${requestBodyContentType.toString()}",
"Request Body: ${requestBody.toString()}",
"Response Status: $responseStatus",
@ -215,8 +224,8 @@ class RequestModel {
other.requestTabIndex == requestTabIndex &&
listEquals(other.requestHeaders, requestHeaders) &&
listEquals(other.requestParams, requestParams) &&
listEquals(other.enabledHeaders, enabledHeaders) &&
listEquals(other.enabledParams, enabledParams) &&
listEquals(other.isHeaderEnabledList, isHeaderEnabledList) &&
listEquals(other.isParamEnabledList, isParamEnabledList) &&
other.requestBodyContentType == requestBodyContentType &&
other.requestBody == requestBody &&
other.responseStatus == responseStatus &&
@ -236,8 +245,8 @@ class RequestModel {
requestTabIndex,
requestHeaders,
requestParams,
enabledHeaders,
enabledParams,
isHeaderEnabledList,
isParamEnabledList,
requestBodyContentType,
requestBody,
responseStatus,