Merge branch 'app-developement' of https://github.com/Libertech-FR/teaket into app-developement

Author: RICHARD-Quentin

Makefile

@@ -66,4 +66,7 @@ buildseeds: ## Build populate image
 	docker build -t seeding -f ./populate/Dockerfile ./populate
 
 populate-db: ## Populate database
-	docker run --rm --network dev -v ./populate:/app -v ./service/.dev-token.json:/app/.dev-token.json seeding
+	docker run --rm --network dev -v $(CURDIR)/populate:/app -v $(CURDIR)/service/.dev-token.json:/app/.dev-token.json seeding
+
+populate-from-gaiasys: ## Populate database
+	docker run --rm --network dev -v $(CURDIR)/populate:/app -v $(CURDIR)/service/.dev-token.json:/app/.dev-token.json seeding python populate_from_gaiasys.py

app/src/components/searchfilters/Main.vue

@@ -71,7 +71,7 @@ const comparatorTypes = ref<Comparator[]>([
   { label: 'Inférieur à', querySign: '<', value: '<', icon: 'mdi-less-than', type: ['number', 'date'], multiplefields: false, prefix: '', suffix: '' },
   { label: 'Inférieur ou égal à', querySign: '<=', value: '<=', icon: 'mdi-less-than-or-equal', type: ['number', 'date'], multiplefields: false, prefix: '', suffix: '' },
   { label: 'entre', querySign: '<<', value: 'between', icon: 'mdi-arrow-expand-horizontal', type: ['number', 'date'], multiplefields: true, prefix: '', suffix: '' },
-  { label: 'Contiens', querySign: '^', value: '^', icon: 'mdi-apple-keyboard-control', type: ['text'], multiplefields: false, prefix: '/', suffix: '/' },
+  { label: 'Contiens', querySign: '^', value: '^', icon: 'mdi-apple-keyboard-control', type: ['text'], multiplefields: false, prefix: '/', suffix: '/i' },
   { label: 'Commence par', querySign: '^', value: '/^', icon: 'mdi-apple-keyboard-control', type: ['text'], multiplefields: false, prefix: '/^', suffix: '/' },
   { label: 'Fini par', querySign: '^', value: '$/', icon: 'mdi-apple-keyboard-control', type: ['text'], multiplefields: false, prefix: '/', suffix: '$/' },
   { label: 'Egal à', querySign: '@', value: '@', icon: 'mdi-apple-keyboard-control', type: [], multiplefields: true, prefix: '', suffix: '' },

app/src/error.example.vue

@@ -0,0 +1,17 @@
+<template>
+  <div>
+    <p>{{ error.statusCode }}</p>
+    <p>{{ error.message }}</p>
+  </div>
+</template>
+
+<script lang='ts' setup>
+import { NuxtError } from '#app'
+
+defineProps({
+  error: {
+    type: Object as PropType<NuxtError>,
+    default: null,
+  },
+})
+</script>

app/src/plugins/fetch-catch.ts

@@ -0,0 +1,6 @@
+export default defineNuxtPlugin((nuxtApp) => {
+  // nuxtApp.vueApp.config.errorHandler = (error, context) => {
+  //   console.log('errorHandler', error, context)
+  //   // return showError({ statusCode: 404, statusMessage: 'nnnnnnnnnnnnn' })
+  // }
+})

populate/.editorconfig

@@ -0,0 +1,20 @@
+# http://editorconfig.org
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+max_line_length = 120
+
+[Makefile]
+indent_style = tab
+
+[*.md]
+trim_trailing_whitespace = false
+
+[*.py]
+indent_size = 4

populate/populate_data.py

@@ -14,6 +14,7 @@
 
 # Get the MongoDB URL from the environment variables
 mongo_url = os.getenv("MONGODB_URL")
+token_path = os.path.join(os.path.dirname(__file__), '.dev-token.json')
 collections = [
     {
         "name": "identities",
@@ -88,24 +89,35 @@
 
 api_endpoint = os.getenv("API_BASE_URL")
 
-async def populate_collection(collection):
+
+async def populate_collection(collection, token):
     logger.info(f"Populating {collection.get('name')}...")
     file_path = os.path.join(os.path.dirname(__file__), 'seeds', collection.get('file'))
+    headers = {
+        "Authorization": f"Bearer {token}", "Content-Type": "application/json; charset=utf-8"
+    }
     with open(file_path) as f:
         datas = json.load(f)
         for data in datas:
             try:
-                response = requests.post(f"{api_endpoint}/{collection.get('endpoint')}", json=data)
+                response = requests.post(f"{api_endpoint}/{collection.get('endpoint')}", headers=headers, json=data)
                 response.raise_for_status()
                 logger.info(f"{collection.get('name')} inserted")
             except Exception as e:
                 logger.warning(f"Failed to insert {collection.get('name')}: {e}")
+                error_message = response.json().get('message')
+                logger.warning(f"Failed to insert {collection.get('name')}: {error_message}")
+
 
 async def main():
-    collection_tasks = [populate_collection(col) for col in collections]
+    with open(token_path) as f:
+        token = json.load(f).get("access_token")
+        logger.info(f"Load DEV Token <{token}>")
+    collection_tasks = [populate_collection(col, token) for col in collections]
     await asyncio.gather(*collection_tasks)
 
     print("DB populated")
 
+
 if __name__ == "__main__":
-    asyncio.run(main())
+    asyncio.run(main())