Merge branch 'master' of https://gitlab.com/cybertronprime/optimus-api

swagger.yaml

@@ -34,7 +34,7 @@ paths:
                   example: "demo@demoptimus.fr"
                 password:
                   type: string
-                  example: "W26b3RTE8mj4L3Su6GJBjz0qXtPIcNaM"
+                  example: "4f0JDn9JWTqlFVHrUihyybNVWJpF98hY"
       responses:
         default:
           $ref: '#/components/responses/standardResponse'
@@ -187,7 +187,7 @@ paths:
                     sort_rank: null
                     sort_order: null
                 advanced_search: 
-                  - field: 'id'
+                  - field: '0'
                     operator: '>='
                     value: '10'
                     next: 'AND'
@@ -357,8 +357,13 @@ paths:
                     filter: null
                     sort_rank: null
                     sort_order: null
+                  - name: date_ouverture
+                    dblink: null
+                    filter: null
+                    sort_rank: null
+                    sort_order: null
                 advanced_search: 
-                  - field: 'date_ouverture'
+                  - field: '3'
                     operator: '>='
                     value: '2018-01-01'
                     next: 'AND'
@@ -993,7 +998,7 @@ paths:
                     sort_rank: null
                     sort_order: null
                 advanced_search: 
-                  - field: 'id'
+                  - field: '0'
                     operator: '>='
                     value: '10'
                     next: 'AND'
@@ -1193,7 +1198,7 @@ paths:
                 settings:
                   global_search: "Dossier 1234"
                   order: [2,1,4,3]
-                  advanced_search: [{"field":"date_ouverture", "operator":">=", "value":"2018-01-01", "next":"AND"},{"field":"date_ouverture", "operator":"<=", "value":"2021-01-01", "next":"AND"}]
+                  advanced_search: [{"field":"0", "operator":">=", "value":"2018-01-01", "next":"AND"},{"field":"date_ouverture", "operator":"<=", "value":"2021-01-01", "next":"AND"}]
       responses:
         default:
           $ref: '#/components/responses/standardResponse'
@@ -1263,10 +1268,10 @@ paths:
   
   '/{db}/operations':
     get:
-      summary: "Retourne la liste des operations"
+      summary: "Retourne la liste des operations bancaires"
       tags:
         - compta
-      operationId: compta_recettes
+      operationId: compta_operations
       parameters:
         - name: db
           in: path
@@ -1282,10 +1287,10 @@ paths:
         - cookieAuth: []
   '/{db}/operations/{id}':
     get:
-      summary: "Retourne une opération déterminée à partir de son numéro id"
+      summary: "Retourne une opération bancaire déterminée à partir de son numéro id"
       tags:
         - compta
-      operationId: compta_recette
+      operationId: compta_operation
       parameters:
         - name: db
           in: path
@@ -1308,10 +1313,10 @@ paths:
   
   '/{db}/recettes':
     get:
-      summary: "Retourne la liste des recettes"
+      summary: "Retourne la liste des recettes comptabilisées"
       tags:
         - compta
-      operationId: compta_operations
+      operationId: compta_recettes
       parameters:
         - name: db
           in: path
@@ -1331,7 +1336,7 @@ paths:
       summary: "Retourne une recette déterminée à partir de son numéro id"
       tags:
         - compta
-      operationId: compta_operation
+      operationId: compta_recette
       parameters:
         - name: db
           in: path
@@ -1359,6 +1364,8 @@ components:
       properties:
         id:
           type: integer
+        categorie:
+          type: integer
         type:
           type: integer
         title:
@@ -1392,9 +1399,7 @@ components:
           type: number
         siret:
           type: string
-        company_registration_city:
-          type: string
-        company_representative:
+        company_greffe:
           type: integer
         address:
           type: string
@@ -1416,10 +1421,6 @@ components:
           type: string
         website:
           type: string
-        company:
-          type: integer
-        job_title:
-          type: string
         pro_phone:
           type: string
         pro_fax:
@@ -1438,10 +1439,9 @@ components:
           type: string
         notes:
           type: string
-        categorie:
-          type: integer
       example:
         id: 0
+        categorie: 10
         type: 30
         title: 0
         firstname: "Ludivine"
@@ -1458,8 +1458,7 @@ components:
         company_type: 0
         company_capital: null
         siret: null
-        company_registration_city: null
-        company_representative: 0
+        company_greffe: null
         address: "Lieu dit Trouperdu\n5 rue de la Forêt"
         zipcode: "68000"
         city: "68066"
@@ -1469,8 +1468,6 @@ components:
         mobile: "+33 6 12 34 56 79"
         email: "justine.tartampion@gmail.com"
         website: null
-        company: 0
-        job_title: null
         pro_phone: "+33 3 23 45 67 89"
         pro_fax: "+33 3 23 45 67 80"
         pro_mobile: "+33 6 23 45 67 89"
@@ -1480,7 +1477,6 @@ components:
         bic: "CMCIFRPP"
         tva: null
         notes: "blah blah blah\nblah blah"
-        categorie: 0
     dossier:
       type: object
       properties:
@@ -1771,4 +1767,4 @@ components:
                   create:
                     type: boolean
                   delete:
-                    type: boolean
\ No newline at end of file
+                    type: boolean