[add] Activity model configuration

[fix] 2 defail bugs
kaiyuanshe · Nov 27, 2023 · 2828cf8 · 2828cf8
1 parent faef175
commit 2828cf8
Show file tree

Hide file tree

Showing 9 changed files with 434 additions and 79 deletions.
diff --git a/config/database.ts b/config/database.ts
@@ -24,20 +24,23 @@ export default ({ env }) => {
 
   const connections = {
     mysql: {
-      connection: { ...connection, port: port || 3306, connectionString },
+      connection: connectionString
+        ? { connectionString }
+        : { ...connection, port: port || 3306 },
       pool,
     },
     mysql2: {
       connection: { ...connection, port: port || 3306 },
       pool,
     },
     postgres: {
-      connection: {
-        ...connection,
-        port: port || 5432,
-        connectionString,
-        schema: env('DATABASE_SCHEMA', 'public'),
-      },
+      connection: connectionString
+        ? { connectionString, schema: env('DATABASE_SCHEMA', 'public') }
+        : {
+            ...connection,
+            port: port || 5432,
+            schema: env('DATABASE_SCHEMA', 'public'),
+          },
       pool,
     },
     sqlite: {

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -20,7 +20,6 @@ services:
       - DATABASE_CLIENT=postgres
       - DATABASE_URL=postgres://postgres:${ADMIN_JWT_SECRET}@postgres-server:5432/postgres
       - NODE_ENV=production
-      - PORT=1337
     ports:
       - 1337:1337
     healthcheck:

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ohp/web-server",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "private": true,
   "engines": {
     "node": ">=18.0.0 <=20.x.x",
@@ -26,9 +26,9 @@
     "styled-components": "^5.3.11"
   },
   "devDependencies": {
-    "@codemirror/autocomplete": "^6.11.0",
+    "@codemirror/autocomplete": "^6.11.1",
     "@codemirror/lint": "^6.4.2",
-    "@codemirror/search": "^6.5.4",
+    "@codemirror/search": "^6.5.5",
     "@codemirror/theme-one-dark": "^6.1.2",
     "cross-env": "^7.0.3",
     "get-git-folder": "^0.1.2",
@@ -48,7 +48,7 @@
     "test": "lint-staged",
     "strapi": "strapi",
     "clean": "rm -rf .cache/ .strapi/ dist/",
-    "develop": "npm run clean  &&  strapi build  &&  strapi develop",
+    "develop": "npm run clean  &&  strapi ts:generate-types  &&  strapi build  &&  strapi develop",
     "build": "npm run clean  &&  cross-env NODE_ENV=production  strapi build",
     "start": "cross-env NODE_ENV=production  strapi start",
     "pack-image": "docker build -t ohp/strapi-server:latest .",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/api/activity/content-types/activity/schema.json b/src/api/activity/content-types/activity/schema.json
@@ -0,0 +1,169 @@
+{
+  "kind": "collectionType",
+  "collectionName": "activities",
+  "info": {
+    "singularName": "activity",
+    "pluralName": "activities",
+    "displayName": "Activity",
+    "description": ""
+  },
+  "options": {
+    "draftAndPublish": true
+  },
+  "pluginOptions": {
+    "i18n": {
+      "localized": true
+    }
+  },
+  "attributes": {
+    "name": {
+      "pluginOptions": {
+        "i18n": {
+          "localized": true
+        }
+      },
+      "type": "string",
+      "required": true,
+      "unique": true
+    },
+    "displayName": {
+      "pluginOptions": {
+        "i18n": {
+          "localized": true
+        }
+      },
+      "type": "string",
+      "required": true,
+      "unique": true
+    },
+    "ribbon": {
+      "pluginOptions": {
+        "i18n": {
+          "localized": true
+        }
+      },
+      "type": "string",
+      "required": false
+    },
+    "summary": {
+      "pluginOptions": {
+        "i18n": {
+          "localized": true
+        }
+      },
+      "type": "string"
+    },
+    "detail": {
+      "pluginOptions": {
+        "i18n": {
+          "localized": true
+        }
+      },
+      "type": "customField",
+      "options": {
+        "output": "HTML",
+        "preset": "rich"
+      },
+      "required": true,
+      "customField": "plugin::ckeditor.CKEditor"
+    },
+    "banners": {
+      "allowedTypes": ["images", "videos"],
+      "type": "media",
+      "multiple": true,
+      "pluginOptions": {
+        "i18n": {
+          "localized": true
+        }
+      },
+      "required": true
+    },
+    "status": {
+      "pluginOptions": {
+        "i18n": {
+          "localized": true
+        }
+      },
+      "type": "enumeration",
+      "enum": ["planning", "pendingApproval", "online", "offline"],
+      "default": "planning",
+      "required": true
+    },
+    "creator": {
+      "type": "relation",
+      "relation": "oneToOne",
+      "target": "plugin::users-permissions.user"
+    },
+    "maxEnrollment": {
+      "pluginOptions": {
+        "i18n": {
+          "localized": false
+        }
+      },
+      "type": "integer",
+      "min": 0
+    },
+    "tags": {
+      "pluginOptions": {
+        "i18n": {
+          "localized": true
+        }
+      },
+      "type": "string"
+    },
+    "eventStartedAt": {
+      "pluginOptions": {
+        "i18n": {
+          "localized": false
+        }
+      },
+      "type": "datetime",
+      "required": true
+    },
+    "eventEndedAt": {
+      "pluginOptions": {
+        "i18n": {
+          "localized": false
+        }
+      },
+      "type": "datetime",
+      "required": true
+    },
+    "enrollmentStartedAt": {
+      "pluginOptions": {
+        "i18n": {
+          "localized": false
+        }
+      },
+      "type": "datetime",
+      "required": true
+    },
+    "enrollmentEndedAt": {
+      "pluginOptions": {
+        "i18n": {
+          "localized": false
+        }
+      },
+      "type": "datetime",
+      "required": true
+    },
+    "judgeStartedAt": {
+      "pluginOptions": {
+        "i18n": {
+          "localized": false
+        }
+      },
+      "type": "datetime",
+      "required": true
+    },
+    "judgeEndedAt": {
+      "pluginOptions": {
+        "i18n": {
+          "localized": false
+        }
+      },
+      "type": "datetime",
+      "required": true
+    }
+  }
+}
diff --git a/src/api/activity/controllers/activity.ts b/src/api/activity/controllers/activity.ts
@@ -0,0 +1,7 @@
+/**
+ * activity controller
+ */
+
+import { factories } from '@strapi/strapi';
+
+export default factories.createCoreController('api::activity.activity');
diff --git a/src/api/activity/routes/activity.ts b/src/api/activity/routes/activity.ts
@@ -0,0 +1,7 @@
+/**
+ * activity router
+ */
+
+import { factories } from '@strapi/strapi';
+
+export default factories.createCoreRouter('api::activity.activity');
diff --git a/src/api/activity/services/activity.ts b/src/api/activity/services/activity.ts
@@ -0,0 +1,7 @@
+/**
+ * activity service
+ */
+
+import { factories } from '@strapi/strapi';
+
+export default factories.createCoreService('api::activity.activity');