move count and pages to fields

chubbyphp-legacy · Sep 27, 2017 · e0c7a92 · e0c7a92
1 parent 1c2199f
commit e0c7a92
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/app/Serialization/CourseSearchMapping.php b/app/Serialization/CourseSearchMapping.php
@@ -65,6 +65,8 @@ public function getFieldMappings(): array
             ),
             new FieldMapping('sort'),
             new FieldMapping('order'),
+            new FieldMapping('count'),
+            new FieldMapping('pages'),
         ];
     }
 
@@ -74,8 +76,6 @@ public function getFieldMappings(): array
     public function getEmbeddedFieldMappings(): array
     {
         return [
-            new FieldMapping('count'),
-            new FieldMapping('pages'),
             new FieldMapping('courses', new CollectionFieldSerializer(new PropertyAccessor('courses'))),
         ];
     }
@@ -88,6 +88,8 @@ public function getLinkMappings(): array
         return [
             new LinkMapping('self', new CallbackLinkSerializer(
                 function (Request $request, CourseSearch $courseSearch, array $fields) {
+                    unset($fields['count'], $fields['pages']);
+
                     return $this->linkGenerator->generateLink($request, 'course_search', [], $fields);
                 }
             )),
@@ -96,6 +98,8 @@ function (Request $request, CourseSearch $courseSearch, array $fields) {
                     if ($courseSearch->getPage() > 1) {
                         $fields['page'] -= 1;
 
+                        unset($fields['count'], $fields['pages']);
+
                         return $this->linkGenerator->generateLink($request, 'course_search', [], $fields);
                     }
 
@@ -107,6 +111,8 @@ function (Request $request, CourseSearch $courseSearch, array $fields) {
                     if ($fields['page'] < $courseSearch->getPages()) {
                         $fields['page'] += 1;
 
+                        unset($fields['count'], $fields['pages']);
+
                         return $this->linkGenerator->generateLink($request, 'course_search', [], $fields);
                     }
 

diff --git a/public/swagger/models/course.yml b/public/swagger/models/course.yml
@@ -282,17 +282,17 @@ definitions:
             order:
                 type: string
                 example: asc
+            count:
+                type: integer
+                example: 1
+            pages:
+                type: integer
+                example: 1
             _embedded:
                 type: object
                 xml:
                     name: meta-embedded
                 properties:
-                    count:
-                        type: integer
-                        example: 1
-                    pages:
-                        type: integer
-                        example: 1
                     courses:
                         type: array
                         xml: