Appwrite/appwrite
1
0
Fork 0
mirror of https://github.com/appwrite/appwrite.git synced 2026-05-26 13:51:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

lint fixes

Browse Source
This commit is contained in:
prateek banga
2023-08-03 17:39:13 +05:30
parent f797c2574a
commit ea57a303d0
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/controllers/api/databases.php
+6 -6
View File
@@ -1676,7 +1676,7 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/attributes')
throw new Exception(Exception::COLLECTION_NOT_FOUND);
}
$queriesFromRequest = Query::parseQueries($queries);
$queriesFromRequest = Query::parseQueries($queries);
// Add type property in query if select query exists and type property doesn't exist as type is required for response model
$hasDetailsinQuery = [
@@ -1687,7 +1687,7 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/attributes')
if ($query->getMethod() === Query::TYPE_SELECT) {
$hasDetailsinQuery['selectQuery'] = true;
}
if(\array_search('type', $query->getValues())){
if (\array_search('type', $query->getValues())) {
$hasDetailsinQuery['typeAttributeInSelectQuery'] = true;
}
}
@@ -1715,16 +1715,16 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/attributes')
}
$cursor->setValue($cursorDocument[0]);
}
$attributes = $dbForProject->find('attributes', $transformedQueries);
$filterQueries = Query::groupByType($transformedQueries)['filters'];
$total = $dbForProject->count('attributes', $filterQueries, APP_LIMIT_COUNT);
//Add relationship data from options to attributes as it loses options during response setup
foreach ($attributes as $attribute) {
if ($attribute->getAttribute('type') === Database::VAR_RELATIONSHIP ) {
if ($attribute->getAttribute('type') === Database::VAR_RELATIONSHIP) {
$options = $attribute->getAttribute('options');
if(!\is_null($options)){
if (!\is_null($options)) {
$attribute->setAttribute('relatedCollection', $options['relatedCollection']);
$attribute->setAttribute('relationType', $options['relationType']);
$attribute->setAttribute('twoWay', $options['twoWay']);
@@ -1741,7 +1741,7 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/attributes')
// If type Attribute didn't exist in select query we need to remove type attribute from attribute list
if ($hasDetailsinQuery['selectQuery'] && !$hasDetailsinQuery['typeAttributeInSelectQuery']) {
foreach($output['attributes'] as &$attribute) {
foreach ($output['attributes'] as &$attribute) {
unset($attribute['type']);
}
}
src/Appwrite/Utopia/Response.php
+4 -4
View File
@@ -466,7 +466,7 @@ class Response extends SwooleResponse
* return void
* @throws Exception
*/
public function static(array $output): void
public function static(array $output): void
{
switch ($this->getContentType()) {
case self::CONTENT_TYPE_JSON:
@@ -523,7 +523,7 @@ class Response extends SwooleResponse
if (!is_array($document[$key])) {
throw new Exception($key . ' must be an array of type ' . $rule['type']);
}
foreach ($document[$key] as $index => $item) {
if ($item instanceof Document) {
if (\is_array($rule['type'])) {
@@ -543,11 +543,11 @@ class Response extends SwooleResponse
} else {
$ruleType = $rule['type'];
}
if (!array_key_exists($ruleType, $this->models)) {
throw new Exception('Missing model for rule: ' . $ruleType);
}
$data[$key][$index] = $this->output($item, $ruleType);
}
}