✨ Add MinIO Service and Update Dependencies

- Introduce MinIO service in Docker Compose for object storage, including environment variables for configuration.
- Update package.json and package-lock.json to include new dependencies: axios and minio.
- Refactor articles and user models to utilize enums for article status and user roles, enhancing code clarity and maintainability.
- Modify article and register validators to incorporate new fields and validation rules.
- Update article creation and registration forms to support new fields and improve user experience.

Author: BrightkyEfoo

app/controllers/api/upload_controller.ts

@@ -0,0 +1,19 @@
+import { HttpContext } from '@adonisjs/core/http'
+import MinioService from '#services/minio_service'
+
+export default class UploadController {
+  async presign({ request }: HttpContext) {
+    const { fileName, mimeType } = request.only(['fileName', 'mimeType'])
+    const { url, key } = await MinioService.getPresignedUrl(fileName, mimeType)
+    return { url, key }
+  }
+
+  async presignView({ request }: HttpContext) {
+    const key = request.input('key') || request.qs().key
+    if (!key) {
+      return { error: 'Missing key' }
+    }
+    const url = await MinioService.getPresignedViewUrl(key)
+    return { url }
+  }
+}

app/controllers/articles_controller.ts

@@ -3,13 +3,14 @@ import { articleValidator } from '#validators/article_validator'
 import Article from '#models/article'
 import { DateTime } from 'luxon'
 import ArticleStatsService from '#services/article_stats_service'
+import { ArticleStatus } from '#enums/article_status'
 
 export default class ArticlesController {
   async index({ inertia, request }: HttpContext) {
     const page = request.input('page', 1)
     const articles = await Article.query()
       .preload('author')
-      .where('is_published', true)
+      .where('status', ArticleStatus.PUBLISHED)
       .orderBy('published_at', 'desc')
       .paginate(page, 10)
 
@@ -29,11 +30,14 @@ export default class ArticlesController {
     article.title = data.title
     article.content = data.content
     article.excerpt = data.excerpt
-    article.isPublished = data.isPublished || false
+    article.status = data.status as ArticleStatus
     article.authorId = auth.user!.id
-    if (data.isPublished) {
+    if (data.status === ArticleStatus.PUBLISHED) {
       article.publishedAt = DateTime.now()
     }
+    article.coverImage = data.coverImage || null
+    article.canonicalUrl = data.canonicalUrl || null
+    article.tags = data.tags || []
 
     await article.generateSlug()
     await article.save()
@@ -52,6 +56,7 @@ export default class ArticlesController {
     return inertia.render('dashboard/index', {
       publishedArticles: stats.published,
       draftArticles: stats.drafts,
+      waitingArticles: stats.waiting,
       discussions: 0,
       questions: 0,
     })

app/controllers/auth/register_controller.ts

@@ -1,6 +1,7 @@
 import { HttpContext } from '@adonisjs/core/http'
 import User from '#models/user'
 import { registerValidator } from '#validators/register_validator'
+import { Role } from '#enums/role'
 
 export default class RegisterController {
   async show({ inertia }: HttpContext) {
@@ -10,7 +11,10 @@ export default class RegisterController {
   async store({ request, auth, response }: HttpContext) {
     const data = await registerValidator.validate(request.all())
 
-    const user = await User.create(data)
+    const user = await User.create({
+      ...data,
+      role: (data.role as Role) || Role.MEMBER,
+    })
     await auth.use('web').login(user)
 
     return response.redirect().toRoute('dashboard')

app/models/article.ts

@@ -3,6 +3,7 @@ import { BaseModel, belongsTo, column } from '@adonisjs/lucid/orm'
 import type { BelongsTo } from '@adonisjs/lucid/types/relations'
 import string from '@adonisjs/core/helpers/string'
 import User from '#models/user'
+import { ArticleStatus } from '#enums/article_status'
 
 export default class Article extends BaseModel {
   @column({ isPrimary: true })
@@ -21,7 +22,7 @@ export default class Article extends BaseModel {
   declare excerpt: string
 
   @column()
-  declare isPublished: boolean
+  declare status: ArticleStatus
 
   @column()
   declare authorId: number
@@ -38,6 +39,15 @@ export default class Article extends BaseModel {
   @column.dateTime()
   declare publishedAt: DateTime | null
 
+  @column()
+  declare coverImage: string | null
+
+  @column()
+  declare canonicalUrl: string | null
+
+  @column()
+  declare tags: string[] | null
+
   // Generate slug before saving
   public async generateSlug() {
     this.slug = string.slug(this.title)

app/models/user.ts

@@ -6,6 +6,7 @@ import { withAuthFinder } from '@adonisjs/auth/mixins/lucid'
 import type { HasMany } from '@adonisjs/lucid/types/relations'
 import Article from '#models/article'
 import { DbRememberMeTokensProvider } from '@adonisjs/auth/session'
+import { Role } from '#enums/role'
 
 const AuthFinder = withAuthFinder(() => hash.use('scrypt'), {
   uids: ['email'],
@@ -38,10 +39,7 @@ export default class User extends compose(BaseModel, AuthFinder) {
   declare twitterId: string | null
 
   @column()
-  declare isAdmin: boolean
-
-  @column()
-  declare isSponsor: boolean
+  declare role: Role
 
   @column.dateTime()
   declare emailVerifiedAt: DateTime | null
@@ -70,8 +68,7 @@ export default class User extends compose(BaseModel, AuthFinder) {
       name: this.name,
       email: this.email,
       avatar: this.avatar,
-      isAdmin: this.isAdmin,
-      isSponsor: this.isSponsor,
+      role: this.role,
     }
   }
 }

app/services/article_stats_service.ts

@@ -1,12 +1,21 @@
+import { ArticleStatus } from '#enums/article_status'
 import Article from '#models/article'
 
 export default class ArticleStatsService {
   static async getStats() {
-    const publishedResult = await Article.query().where('is_published', true).count('* as total')
-    const draftResult = await Article.query().where('is_published', false).count('* as total')
+    const publishedResult = await Article.query()
+      .where('status', ArticleStatus.PUBLISHED)
+      .count('* as total')
+    const draftResult = await Article.query()
+      .where('status', ArticleStatus.DRAFT)
+      .count('* as total')
+    const waitingResult = await Article.query()
+      .where('status', ArticleStatus.WAITING_APPROVAL)
+      .count('* as total')
     return {
       published: Number(publishedResult[0].$extras.total),
       drafts: Number(draftResult[0].$extras.total),
+      waiting: Number(waitingResult[0].$extras.total),
     }
   }
 }

app/services/minio_service.ts

@@ -0,0 +1,37 @@
+import { Client } from 'minio'
+import env from '#start/env'
+import { v4 as uuidv4 } from 'uuid'
+
+const minioClient = new Client({
+  endPoint: env.get('MINIO_ENDPOINT') || 'localhost',
+  port: Number(env.get('MINIO_PORT') || '9000'),
+  useSSL: false,
+  accessKey: env.get('MINIO_ROOT_USER') || 'minio',
+  secretKey: env.get('MINIO_ROOT_PASSWORD') || 'minio123',
+})
+
+const BUCKET = env.get('MINIO_DEFAULT_BUCKETS') || 'public'
+
+export default class MinioService {
+  static async upload(file: Buffer, fileName: string, mimeType: string): Promise<string> {
+    // S'assurer que le bucket existe
+    const exists = await minioClient.bucketExists(BUCKET)
+    if (!exists) {
+      await minioClient.makeBucket(BUCKET)
+    }
+    await minioClient.putObject(BUCKET, fileName, file, undefined, { 'Content-Type': mimeType })
+    // URL publique
+    return `${env.get('MINIO_PUBLIC_URL') || 'http://localhost:9000'}/${BUCKET}/${fileName}`
+  }
+
+  static async getPresignedUrl(fileName: string, mimeType: string) {
+    const ext = fileName.split('.').pop()
+    const key = `${uuidv4()}.${ext}`
+    const url = await minioClient.presignedPutObject(BUCKET, key, 60 * 5)
+    return { url, key }
+  }
+
+  static async getPresignedViewUrl(key: string, expirySeconds = 300): Promise<string> {
+    return minioClient.presignedGetObject(BUCKET, key, expirySeconds)
+  }
+}

app/validators/article_validator.ts

@@ -1,11 +1,14 @@
+import { ARTICLE_STATUS_LIST } from '#enums/article_status'
 import vine from '@vinejs/vine'
 
 export const articleValidator = vine.compile(
   vine.object({
     title: vine.string().minLength(10).maxLength(255),
     content: vine.string().minLength(100),
     excerpt: vine.string().minLength(50).maxLength(160),
-    tags: vine.array(vine.string()),
-    isPublished: vine.boolean().optional(),
+    coverImage: vine.string().optional().nullable(),
+    canonicalUrl: vine.string().optional().nullable(),
+    tags: vine.array(vine.string()).optional(),
+    status: vine.enum(ARTICLE_STATUS_LIST),
   })
 )

app/validators/register_validator.ts

@@ -1,4 +1,5 @@
 import vine from '@vinejs/vine'
+import { ROLES_LIST } from '#enums/role'
 
 /**
  * Validates the register action
@@ -9,5 +10,6 @@ export const registerValidator = vine.compile(
     name: vine.string(),
     email: vine.string().email(),
     password: vine.string().minLength(6),
+    role: vine.enum(ROLES_LIST).optional(),
   })
 )

compose.yaml

@@ -67,5 +67,25 @@ services:
       - mysql
     command: sh -c "node ace migration:run"
 
+  minio:
+    image: minio/minio:latest
+    container_name: jscm-minio
+    ports:
+      - "9000:9000"
+      - "9001:9001"
+    env_file:
+      - .env
+    environment:
+      MINIO_ROOT_USER: ${MINIO_ROOT_USER}
+      MINIO_ROOT_PASSWORD: ${MINIO_ROOT_PASSWORD}
+      MINIO_PUBLIC_URL: ${MINIO_PUBLIC_URL}
+      MINIO_DEFAULT_BUCKETS: ${MINIO_DEFAULT_BUCKETS}
+      MINIO_ENDPOINT: ${MINIO_ENDPOINT}
+      MINIO_PORT: ${MINIO_PORT}
+    command: server /data --console-address ":9001"
+    volumes:
+      - minio_data:/data
+
 volumes:
-  mysql_data: 
+  mysql_data:
+  minio_data: