Skip to content

Commit be19505

Browse files
stygiansabyssstygiansabyss
committed
Correcting aware validation to use uniqueId
1 parent c20dcfd commit be19505

14 files changed

+37
-21
lines changed

‎app/models/Character.php

+4-3
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ class Character extends BaseModel
55
/********************************************************************
66
* Declarations
77
*******************************************************************/
8+
protected $primaryKey = 'uniqueId';
89

910
/********************************************************************
1011
* Aware validation rules
@@ -18,9 +19,9 @@ class Character extends BaseModel
1819
*/
1920
public static $rules = array(
2021
'name' => 'required|max:200',
21-
'user_id' => 'required|exists:users,id',
22-
'game_id' => 'required|exists:games,id',
23-
'parent_id' => 'exists:characters,id',
22+
'user_id' => 'required|exists:users,uniqueId',
23+
'game_id' => 'required|exists:games,uniqueId',
24+
'parent_id' => 'exists:characters,uniqueId',
2425
);
2526

2627
/********************************************************************

‎app/models/Chat/Room.php

+3-2
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ class Chat_Room extends BaseModel
1212
* @var string $table The table this model uses
1313
*/
1414
protected $table = 'chat_rooms';
15+
protected $primaryKey = 'uniqueId';
1516

1617
/********************************************************************
1718
* Aware validation rules
@@ -24,8 +25,8 @@ class Chat_Room extends BaseModel
2425
* @var array $rules All rules this model must follow
2526
*/
2627
public static $rules = array(
27-
'user_id' => 'required|exists:users,id',
28-
'game_id' => 'exists:games,id',
28+
'user_id' => 'required|exists:users,uniqueId',
29+
'game_id' => 'exists:games,uniqueId',
2930
'game_template_id' => 'exists:game_templates,id',
3031
'name' => 'required',
3132
);

‎app/models/Forum/Board.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ class Forum_Board extends BaseModel
1212
* @var string $table The table this model uses
1313
*/
1414
protected $table = 'forum_boards';
15+
protected $primaryKey = 'uniqueId';
1516
const TYPE_APPLICATION = 3;
1617
const TYPE_CHILD = 2;
1718
const TYPE_STANDARD = 1;
@@ -31,7 +32,7 @@ class Forum_Board extends BaseModel
3132
public static $rules = array(
3233
'name' => 'required|max:200',
3334
'keyName' => 'required|max:200',
34-
'forum_category_id' => 'required|exists:forum_categories,id',
35+
'forum_category_id' => 'required|exists:forum_categories,uniqueId',
3536
);
3637

3738
/********************************************************************

‎app/models/Forum/Category.php

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ class Forum_Category extends BaseModel
1212
* @var string $table The table this model uses
1313
*/
1414
protected $table = 'forum_categories';
15+
protected $primaryKey = 'uniqueId';
1516
const TYPE_GAME = 2;
1617
const TYPE_STANDARD = 1;
1718
const TYPE_SUPPORT = 3;

‎app/models/Forum/Moderation.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class Forum_Moderation extends BaseModel
2424
* @var array $rules All rules this model must follow
2525
*/
2626
public static $rules = array(
27-
'user_id' => 'required|exists:users,id',
27+
'user_id' => 'required|exists:users,uniqueId',
2828
'reason' => 'required',
2929
);
3030

‎app/models/Forum/Post.php

+3-2
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ class Forum_Post extends BaseModel
1212
* @var string $table The table this model uses
1313
*/
1414
protected $table = 'forum_posts';
15+
protected $primaryKey = 'uniqueId';
1516

1617
const TYPE_ANNOUNCEMENT = 4;
1718
const TYPE_APPLICATION = 8;
@@ -35,8 +36,8 @@ class Forum_Post extends BaseModel
3536
'name' => 'required|max:200',
3637
'keyName' => 'required|max:200',
3738
'content' => 'required',
38-
'forum_board_id' => 'required|exists:forum_boards,id',
39-
'user_id' => 'required',
39+
'forum_board_id' => 'required|exists:forum_boards,uniqueId',
40+
'user_id' => 'required|exists:users,uniqueId',
4041
);
4142

4243
/********************************************************************

‎app/models/Forum/Post/Edit.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ class Forum_Post_Edit extends BaseModel
1111
* Aware validation rules
1212
*/
1313
public static $rules = array(
14-
'user_id' => 'required|exists:users,id',
15-
'forum_post_id' => 'required|exists:forum_posts,id',
14+
'user_id' => 'required|exists:users,uniqueId',
15+
'forum_post_id' => 'required|exists:forum_posts,uniqueId',
1616
);
1717

1818
/**

‎app/models/Forum/Post/View.php

+9-1
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,17 @@ class Forum_Post_View extends BaseModel
44
{
55
protected $table = 'forum_user_view_posts';
66

7+
/**
8+
* Aware validation rules
9+
*/
10+
public static $rules = array(
11+
'user_id' => 'required|exists:users,uniqueId',
12+
'forum_post_id' => 'required|exists:forum_posts,uniqueId',
13+
);
14+
715
public function post()
816
{
9-
return $this->belongsTo('Forum_Post', 'forum_post_type_id');
17+
return $this->belongsTo('Forum_Post', 'forum_post_id');
1018
}
1119

1220
public function user()

‎app/models/Forum/Reply.php

+3-2
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ class Forum_Reply extends BaseModel
1212
* @var string $table The table this model uses
1313
*/
1414
protected $table = 'forum_replies';
15+
protected $primaryKey = 'uniqueId';
1516
const TYPE_ACTION = 4;
1617
const TYPE_CONVERSATION = 2;
1718
const TYPE_INNER_THOUGHT = 3;
@@ -28,8 +29,8 @@ class Forum_Reply extends BaseModel
2829
* @var array $rules All rules this model must follow
2930
*/
3031
public static $rules = array(
31-
'user_id' => 'required|exists:users,id',
32-
'forum_post_id' => 'required|exists:forum_posts,id',
32+
'user_id' => 'required|exists:users,uniqueId',
33+
'forum_post_id' => 'required|exists:forum_posts,uniqueId',
3334
'forum_reply_type_id' => 'required|exists:forum_reply_types,id',
3435
'content' => 'required',
3536
);

‎app/models/Forum/Reply/Edit.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ class Forum_Reply_Edit extends BaseModel
1111
* Aware validation rules
1212
*/
1313
public static $rules = array(
14-
'user_id' => 'required|exists:users,id',
15-
'forum_reply_id' => 'required|exists:forum_replies,id',
14+
'user_id' => 'required|exists:users,uniqueId',
15+
'forum_reply_id' => 'required|exists:forum_replies,uniqueId',
1616
);
1717

1818
/**

‎app/models/Game.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ class Game extends BaseModel
1212
* @var string $table The table this model uses
1313
*/
1414
protected $table = 'games';
15+
protected $primaryKey = 'uniqueId';
1516

1617
/********************************************************************
1718
* Aware validation rules
@@ -25,7 +26,7 @@ class Game extends BaseModel
2526
*/
2627
public static $rules = array(
2728
'name' => 'required|max:200',
28-
'game_type_id' => 'required|exists:game_types,id',
29+
'game_type_id' => 'required|exists:game_types,uniqueId',
2930
);
3031

3132
/********************************************************************

‎app/models/Game/StoryTeller.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ class Game_StoryTeller extends BaseModel
3636
* @var array $rules All rules this model must follow
3737
*/
3838
public static $rules = array(
39-
'game_id' => 'required|exists:games,id',
40-
'user_id' => 'required|exists:users,id',
41-
'character_id' => 'exists:characters,id',
39+
'game_id' => 'required|exists:games,uniqueId',
40+
'user_id' => 'required|exists:users,uniqueId',
41+
'character_id' => 'exists:characters,uniqueId',
4242
);
4343

4444
/********************************************************************

‎app/models/Game/Type.php

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ class Game_Type extends BaseModel
1212
* @var string $table The table this model uses
1313
*/
1414
protected $table = 'game_types';
15+
protected $primaryKey = 'uniqueId';
1516

1617
/********************************************************************
1718
* Aware validation rules

‎app/models/User.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class User extends BaseModel implements UserInterface, RemindableInterface
1414
* @var string $table The table this model uses
1515
*/
1616
protected $table = 'users';
17-
protected $primaryKey = 'uniqueId';
17+
protected $primaryKey = 'uniqueId';
1818

1919
/**
2020
* Soft Delete users instead of completely removing them

0 commit comments

Comments
 (0)