Merge pull request #65 from TaloDev/develop

Clay and MikroORM upgrades

Author: tudddorrr

.github/release.yml

@@ -1,4 +1,4 @@
-hangelog:
+changelog:
   exclude:
     labels:
       - release

_templates/service/new/api-policy.ejs.t

@@ -1,11 +1,11 @@
 ---
-to: "<%= (typeof api !== 'undefined') ? `src/policies/api/${name}s-api.policy.ts` : null %>"
+to: "<%= (typeof api !== 'undefined') ? `src/policies/api/${name}-api.policy.ts` : null %>"
 ---
 import Policy from '../policy'
-import { ServicePolicyResponse } from 'koa-rest-services'
+import { PolicyResponse } from 'koa-clay'
 
-export default class <%= h.changeCase.pascal(name) %>sAPIPolicy extends Policy {
-  async post(): Promise<ServicePolicyResponse> {
+export default class <%= h.changeCase.pascal(name) %>APIPolicy extends Policy {
+  async post(): Promise<PolicyResponse> {
     return await this.hasScope('write:<%= h.changeCase.camel(name) %>s')
   }
 }

_templates/service/new/api-route-import.ejs.t

@@ -3,4 +3,4 @@ inject: true
 to: "<%= (typeof api !== 'undefined') ? 'src/config/api-routes.ts' : null %>"
 after: import \{ service \}
 ---
-import <%= h.changeCase.pascal(name) %>sAPIService from '../services/api/<%= name %>s-api.service'
+import <%= h.changeCase.pascal(name) %>APIService from '../services/api/<%= name %>-api.service'

_templates/service/new/api-route.ejs.t

@@ -3,4 +3,4 @@ inject: true
 to: "<%= (typeof api !== 'undefined') ? 'src/config/api-routes.ts' : null %>"
 before: app\.use\(service
 ---
-  app.use(service('/v1/<%= name %>s', new <%= h.changeCase.pascal(name) %>sAPIService()))
+  app.use(service('/v1/<%= name %>s', new <%= h.changeCase.pascal(name) %>APIService()))

_templates/service/new/api-service-test.ejs.t

@@ -1,18 +1,18 @@
 ---
-to: "<%= (typeof api !== 'undefined') ? `tests/services/_api/${name}s-api/post.test.ts` : null %>"
+to: "<%= (typeof api !== 'undefined') ? `tests/services/_api/${name}-api/post.test.ts` : null %>"
 ---
 import { EntityManager } from '@mikro-orm/core'
 import Koa from 'koa'
 import init from '../../../../src/index'
 import request from 'supertest'
 import APIKey, { APIKeyScope } from '../../../../src/entities/api-key'
-import { createToken } from '../../../../src/services/api-keys.service'
+import { createToken } from '../../../../src/services/api-key.service'
 import UserFactory from '../../../fixtures/UserFactory'
 import GameFactory from '../../../fixtures/GameFactory'
 
 const baseUrl = '/v1/<%= name %>s'
 
-describe('<%= h.changeCase.sentenceCase(name) %>s API service - post', () => {
+describe('<%= h.changeCase.sentenceCase(name) %> API service - post', () => {
   let app: Koa
   let apiKey: APIKey
   let token: string

_templates/service/new/api-service.ejs.t

@@ -1,25 +1,24 @@
 ---
-to: "<%= (typeof api !== 'undefined') ? `src/services/api/${name}s-api.service.ts` : null %>"
+to: "<%= (typeof api !== 'undefined') ? `src/services/api/${name}-api.service.ts` : null %>"
 ---
-import { HasPermission, ServiceRequest, ServiceResponse } from 'koa-rest-services'
-import <%= h.changeCase.pascal(name) %>sAPIPolicy from '../../policies/api/<%= name %>s-api.policy'
-import <%= h.changeCase.pascal(name) %>sService from '../<%= name %>s.service'
+import { HasPermission, Request, Response } from 'koa-clay'
+import <%= h.changeCase.pascal(name) %>APIPolicy from '../../policies/api/<%= name %>-api.policy'
+import <%= h.changeCase.pascal(name) %>Service from '../<%= name %>.service'
 import APIService from './api-service'
 import APIKey from '../../entities/api-key'
 
-export default class <%= h.changeCase.pascal(name) %>APIService extends APIService<<%= h.changeCase.pascal(name) %>sService> {
+export default class <%= h.changeCase.pascal(name) %>APIService extends APIService<<%= h.changeCase.pascal(name) %>Service> {
   constructor() {
     super('<%= name %>s')
   }
 
-  @HasPermission(<%= h.changeCase.pascal(name) %>sAPIPolicy, 'post')
-  async post(req: ServiceRequest): Promise<ServiceResponse> {
+  @HasPermission(<%= h.changeCase.pascal(name) %>APIPolicy, 'post')
+  async post(req: Request): Promise<Response> {
     const key: APIKey = await this.getAPIKey(req.ctx)
-    req.body = {
-      ...req.body,
-      gameId: key.game.id
-    }
-
-    return await this.forwardRequest('post', req)
+    return await this.forwardRequest('post', req, {
+      body: {
+        gameId: key.game.id
+      }
+    })
   }
 }

_templates/service/new/policy.ejs.t

@@ -1,18 +1,18 @@
 ---
-to: src/policies/<%= name %>s.policy.ts
+to: src/policies/<%= name %>.policy.ts
 ---
 import Policy from './policy'
-import { ServicePolicyResponse, ServicePolicyDenial } from 'koa-rest-services'
+import { PolicyResponse, PolicyDenial } from 'koa-clay'
 import { UserType } from '../entities/user'
 
-export default class <%= h.changeCase.pascal(name) %>sPolicy extends Policy {
-  async get(): Promise<ServicePolicyResponse> {
+export default class <%= h.changeCase.pascal(name) %>Policy extends Policy {
+  async get(): Promise<PolicyResponse> {
     return true
   }
 
-  async post(): Promise<ServicePolicyResponse> {
+  async post(): Promise<PolicyResponse> {
     const user = await this.getUser()
-    if (user.type === UserType.DEMO) return new ServicePolicyDenial({ message: 'Demo accounts cannot create <%= h.changeCase.noCase(name) %>s' })
+    if (user.type === UserType.DEMO) return new PolicyDenial({ message: 'Demo accounts cannot create <%= h.changeCase.noCase(name) %>s' })
 
     return true
   }

_templates/service/new/protected-route-import.ejs.t

@@ -3,4 +3,4 @@ inject: true
 to: src/config/protected-routes.ts
 after: import \{ service \}
 ---
-import <%= h.changeCase.pascal(name) %>sService from '../services/<%= name %>s.service'
+import <%= h.changeCase.pascal(name) %>Service from '../services/<%= name %>.service'

_templates/service/new/protected-route.ejs.t

@@ -3,4 +3,4 @@ inject: true
 to: src/config/protected-routes.ts
 before: app\.use\(service
 ---
-  app.use(service('/<%= name %>s', new <%= h.changeCase.pascal(name) %>sService()))
+  app.use(service('/<%= name %>s', new <%= h.changeCase.pascal(name) %>Service()))

_templates/service/new/service-test.ejs.t

@@ -1,5 +1,5 @@
 ---
-to: tests/services/<%= name %>s/get.test.ts
+to: tests/services/<%= name %>/get.test.ts
 ---
 import { EntityManager } from '@mikro-orm/core'
 import Koa from 'koa'
@@ -11,7 +11,7 @@ import UserFactory from '../../fixtures/UserFactory'
 
 const baseUrl = '/<%= name %>s'
 
-describe('<%= h.changeCase.sentenceCase(name) %>s service - get', () => {
+describe('<%= h.changeCase.sentenceCase(name) %> service - get', () => {
   let app: Koa
   let user: User
   let token: string