Skip to content

Commit

Permalink
Merge pull request #32 from damian-pastorini/develop
Browse files Browse the repository at this point in the history
- Reldens - Items System
  • Loading branch information
damian-pastorini authored Sep 21, 2020
2 parents 69b5e6b + 2ef80e1 commit 8773517
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion lib/items-events.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
*/

// @NOTE: events are long because because need to be more descriptive.
// @NOTE: events names are long because these need to be descriptive.

let pref = 'reldens.items.';

Expand Down
4 changes: 2 additions & 2 deletions lib/server/storage/models/group.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
*
*/

const { Model } = require('objection');
const { ModelClass } = require('@reldens/storage');

class GroupModel extends Model
class GroupModel extends ModelClass
{

static get tableName()
Expand Down
6 changes: 3 additions & 3 deletions lib/server/storage/models/inventory.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
*
*/

const { Model } = require('objection');
const { ModelClass } = require('@reldens/storage');

class InventoryModel extends Model
class InventoryModel extends ModelClass
{

static get tableName()
Expand All @@ -19,7 +19,7 @@ class InventoryModel extends Model
const { ItemModel } = require('./item');
return {
items_item: {
relation: Model.HasOneRelation,
relation: ModelClass.HasOneRelation,
modelClass: ItemModel,
join: {
from: 'items_inventory.item_id',
Expand Down
10 changes: 5 additions & 5 deletions lib/server/storage/models/item.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
*
*/

const { Model } = require('objection');
const { ModelClass } = require('@reldens/storage');

class ItemModel extends Model
class ItemModel extends ModelClass
{

static get tableName()
Expand All @@ -21,23 +21,23 @@ class ItemModel extends Model
const { ModifiersModel } = require('./modifiers');
return {
items_inventory: {
relation: Model.BelongsToOneRelation,
relation: ModelClass.BelongsToOneRelation,
modelClass: InventoryModel,
join: {
from: 'items_item.id',
to: 'items_inventory.item_id'
}
},
items_group_id: {
relation: Model.HasOneRelation,
relation: ModelClass.HasOneRelation,
modelClass: InventoryGroup,
join: {
from: 'items_item.group_id',
to: 'items_group.id'
}
},
items_modifiers: {
relation: Model.HasManyRelation,
relation: ModelClass.HasManyRelation,
modelClass: ModifiersModel,
join: {
from: 'items_item.id',
Expand Down
6 changes: 3 additions & 3 deletions lib/server/storage/models/modifiers.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
*
*/

const { Model } = require('objection');
const { ModelClass } = require('@reldens/storage');

class ModifiersModel extends Model
class ModifiersModel extends ModelClass
{

static get tableName()
Expand All @@ -19,7 +19,7 @@ class ModifiersModel extends Model
const { ItemModel } = require('./item');
return {
items_group_id: {
relation: Model.BelongsToOneRelation,
relation: ModelClass.BelongsToOneRelation,
modelClass: ItemModel,
join: {
from: 'items_item_modifiers.item_id',
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@reldens/items-system",
"scope": "@reldens",
"version": "0.6.5",
"version": "0.6.6",
"description": "Reldens - Items System",
"author": "Damian A. Pastorini",
"license": "MIT",
Expand Down Expand Up @@ -36,7 +36,7 @@
},
"dependencies": {
"@reldens/modifiers": "^0.3.2",
"@reldens/storage": "^0.1.9",
"@reldens/storage": "^0.1.10",
"@reldens/utils": "^0.1.8"
}
}

0 comments on commit 8773517

Please sign in to comment.