@@ -36,7 +36,7 @@ public function storable ( BaseModel $obj ): array {
3636 return $ arr ;
3737 }
3838
39- protected function filterAttrUser ( $ arr , $ class ) {
39+ protected function filterUserAttrs ( $ arr , $ class ) {
4040 $ map = $ class ::attribute_mapping_list ();
4141 $ userAttrNames = array_map ( fn ( $ e ) => $ e [0 ], array_filter ( $ map , fn ( $ e ) => str_ends_with ( $ e [1 ], 'User ' ) ) );
4242 $ userArrayAttrNames = array_filter ( $ userAttrNames , fn ( $ str ) => $ str == StrTool::plural ( $ str ) );
@@ -46,10 +46,10 @@ protected function filterAttrUser ( $arr, $class ) {
4646 $ arr [$ k ] = $ v ['nulabId ' ] ?? null ;
4747 }
4848 if ( in_array ( $ k , $ userArrayAttrNames ) ) {
49- $ arr [$ k ] = array_map ( fn ( $ e ) => $ e ["userId " ], $ v );
49+ $ arr [$ k ] = array_map ( fn ( $ e ) => $ e ["id " ], $ v );
5050 }
5151 if ( in_array ( $ k , $ userAttrNames ) ) {
52- $ arr [$ k ] = $ v ["userId " ] ?? null ;
52+ $ arr [$ k ] = $ v ["id " ] ?? null ;
5353 }
5454 }
5555
@@ -69,7 +69,7 @@ protected function filterAttribnutes($arr,$class,$attrName){
6969 return $ arr ;
7070 }
7171 protected function filterAttr ( $ arr , $ class ) {
72- $ arr = $ this ->filterAttrUser ($ arr , $ class );
72+ $ arr = $ this ->filterUserAttrs ($ arr , $ class );
7373 $ arr = $ this ->filterAttribnutes ($ arr ,$ class , 'attachments ' );
7474 $ arr = $ this ->filterAttribnutes ($ arr ,$ class , 'stars ' );
7575 $ arr = $ this ->filterAttribnutes ($ arr ,$ class , 'sharedFiles ' );
@@ -124,7 +124,7 @@ protected function getInterfaceAttrs( $obj ) {
124124 if ( $ this ->hasInterface ($ obj , ProjectAttrs::class) ) {
125125 /** @var ProjectAttrs $obj */
126126 $ cols ['teams ' ] = array_map (fn ( $ e ) => $ e ->id , $ obj ->teams ());
127- $ cols ['users ' ] = array_map (fn ( $ e ) => $ e ->userId , $ obj ->users ());
127+ $ cols ['users ' ] = array_map (fn ( $ e ) => $ e ->id , $ obj ->users ());
128128 }
129129
130130 return $ cols ;
0 commit comments