Merge branch 'master' of github.com:gradido/gradido into 1840-refactor-to-filter-object--sub-rename+filters-obj

admin/package.json

@@ -4,7 +4,7 @@
   "main": "index.js",
   "author": "Moriz Wahl",
   "version": "1.8.3",
-  "license": "MIT",
+  "license": "Apache License 2.0",
   "private": false,
   "scripts": {
     "start": "node run/server.js",

backend/log4js-config.json

@@ -13,6 +13,14 @@
     {
       "type": "dateFile",
       "filename": "../logs/backend/apollo.log",
+      "pattern": "%d{ISO8601} %p %c %m",
+      "keepFileExt" : true,
+      "fileNameSep" : "_" 
+    },
+    "backend": 
+    {
+      "type": "dateFile",
+      "filename": "../logs/backend/backend.log",
       "pattern": "%d{ISO8601} %p %c %X{user} %f:%l %m",
       "keepFileExt" : true,
       "fileNameSep" : "_" 
@@ -31,24 +39,52 @@
       "level": "error",
       "appender": "errorFile"
     },
-    "out": 
+    "out":
     {
       "type": "stdout",
       "layout": 
       {
         "type": "pattern", "pattern": "%d{ISO8601} %p %c %X{user} %f:%l %m"
       }
-
-    }
+    },
+    "apolloOut": 
+    {
+      "type": "stdout",
+      "layout": 
+      {
+        "type": "pattern", "pattern": "%d{ISO8601} %p %c %m"
+      }
+    }    
   },
-  "categories": 
+  "categories":
   {
     "default": 
     {
       "appenders": 
       [
         "out",
+        "errors"
+      ],
+      "level": "debug",
+      "enableCallStack": true
+    },
+    "apollo":
+    {
+      "appenders":
+      [
         "apollo",
+        "apolloOut",
+        "errors"
+      ],
+      "level": "debug",
+      "enableCallStack": true
+    },
+    "backend":
+    {
+      "appenders":
+      [
+        "backend",
+        "out",
         "errors"
       ],
       "level": "debug",

backend/package.json

@@ -5,7 +5,7 @@
   "main": "src/index.ts",
   "repository": "https://github.com/gradido/gradido/backend",
   "author": "Ulf Gebhardt",
-  "license": "MIT",
+  "license": "Apache License 2.0",
   "private": false,
   "scripts": {
     "build": "tsc --build",

backend/src/config/index.test.ts

@@ -3,7 +3,7 @@ import CONFIG from './index'
 describe('config/index', () => {
   describe('decay start block', () => {
     it('has the correct date set', () => {
-      expect(CONFIG.DECAY_START_TIME).toEqual(new Date('2021-05-13 17:46:31'))
+      expect(CONFIG.DECAY_START_TIME).toEqual(new Date('2021-05-13 17:46:31-0000'))
     })
   })
 })

backend/src/config/index.ts

@@ -11,7 +11,7 @@ Decimal.set({
 
 const constants = {
   DB_VERSION: '0036-unique_previous_in_transactions',
-  DECAY_START_TIME: new Date('2021-05-13 17:46:31'), // GMT+0
+  DECAY_START_TIME: new Date('2021-05-13 17:46:31-0000'), // GMT+0
   LOG4JS_CONFIG: 'log4js-config.json',
   // default log level on production should be info
   LOG_LEVEL: process.env.LOG_LEVEL || 'info',

backend/src/server/logger.ts

@@ -12,7 +12,6 @@ log4js.configure(options)
 const apolloLogger = log4js.getLogger('apollo')
 const backendLogger = log4js.getLogger('backend')
 
-apolloLogger.addContext('user', 'unknown')
 backendLogger.addContext('user', 'unknown')
 
 export { apolloLogger, backendLogger }

backend/src/server/plugins.ts

@@ -32,16 +32,16 @@ const logPlugin = {
   requestDidStart(requestContext: any) {
     const { logger } = requestContext
     const { query, mutation, variables } = requestContext.request
-    logger.trace(`Request:
+    logger.info(`Request:
 ${mutation || query}variables: ${JSON.stringify(filterVariables(variables), null, 2)}`)
     return {
       willSendResponse(requestContext: any) {
-        if (requestContext.context.user) logger.trace(`User ID: ${requestContext.context.user.id}`)
+        if (requestContext.context.user) logger.info(`User ID: ${requestContext.context.user.id}`)
         if (requestContext.response.data)
-          logger.trace(`Response-Data:
+          logger.info(`Response-Data:
 ${JSON.stringify(requestContext.response.data, null, 2)}`)
         if (requestContext.response.errors)
-          logger.trace(`Response-Errors:
+          logger.error(`Response-Errors:
 ${JSON.stringify(requestContext.response.errors, null, 2)}`)
         return requestContext
       },

database/package.json

@@ -5,7 +5,7 @@
   "main": "src/index.ts",
   "repository": "https://github.com/gradido/gradido/database",
   "author": "Ulf Gebhardt",
-  "license": "MIT",
+  "license": "Apache License 2.0",
   "private": false,
   "scripts": {
     "build": "mkdir -p build/src/config/ && cp src/config/*.txt build/src/config/ && tsc --build",

docu/Concepts/BusinessRequirements/graphics/Creation_Flowchart.drawio

@@ -0,0 +1 @@
+<mxfile host="Electron" modified="2022-05-23T15:29:00.513Z" agent="5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/16.0.2 Chrome/96.0.4664.55 Electron/16.0.5 Safari/537.36" etag="IpEbe50ld79E_2HLyFXN" version="16.0.2" type="device"><diagram id="LWCFUfVkWozhiXBGj4Ze" name="Page-1">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</diagram></mxfile>

frontend/package.json

@@ -99,5 +99,6 @@
     "not ie <= 10"
   ],
   "author": "Gradido-Akademie - https://www.gradido.net/",
+  "license": "Apache License 2.0",
   "description": "Gradido, the Natural Economy of Life, is a way to worldwide prosperity and peace in harmony with nature. - Gradido, die Natürliche Ökonomie des lebens, ist ein Weg zu weltweitem Wohlstand und Frieden in Harmonie mit der Natur."
 }

package.json

@@ -5,7 +5,7 @@
   "main": "index.js",
   "repository": "git@github.com:gradido/gradido.git",
   "author": "Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>",
-  "license": "MIT",
+  "license": "Apache License 2.0",
   "scripts": {
     "release": "scripts/release.sh"
   },