Project-Pro/cmsPRO
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(domain): Domain\Scontainers + Domain\Banners repositories z wrapper delegation

Browse Source 
Phase 3 complete:
- ScontainersRepository: containerDetails, containerSave, containerDelete, scontainerByLang
- BannersRepository: bannerDetails, bannerSave, bannerDelete, activeBanners, mainBanner
- 4 legacy factories converted to thin wrappers delegating to Domain repos

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
Jacek Pyziak
2026-04-04 18:04:42 +02:00
parent 7949e9b6a3
commit 73ff0ca5b6
11 changed files with 612 additions and 286 deletions
Download Patch File Download Diff File Expand all files Collapse all files

148
autoload/Domain/Banners/BannersRepository.php Normal file
View File

@@ -0,0 +1,148 @@
<?php
namespace Domain\Banners;
class BannersRepository
{
private $db;
public function __construct( $db )
{
$this->db = $db;
}
// -------------------------------------------------------------------------
// Odczyt
// -------------------------------------------------------------------------
public function bannerDetails( $bannerId )
{
$banner = $this->db->get( 'pp_banners', '*', [ 'id' => $bannerId ] );
if ( !$banner ) return null;
$langs = $this->db->select( 'pp_banners_langs', '*', [ 'id_banner' => $bannerId ] );
$banner['languages'] = [];
if ( is_array( $langs ) )
foreach ( $langs as $lang )
$banner['languages'][ $lang['id_lang'] ] = $lang;
return $banner;
}
public function activeBanners( $langId )
{
if ( $banners = \Shared\Cache\CacheHandler::fetch( 'banners' ) )
return $banners;
$results = $this->db->query(
'SELECT id, name FROM pp_banners WHERE status = 1 AND ( date_start <= \'' . date( 'Y-m-d' ) . '\' OR date_start IS NULL ) AND ( date_end >= \'' . date( 'Y-m-d' ) . '\' OR date_end IS NULL ) AND home_page = 0'
)->fetchAll( \PDO::FETCH_ASSOC );
$banners = [];
if ( is_array( $results ) )
{
foreach ( $results as $row )
{
$langData = $this->db->get( 'pp_banners_langs', '*', [
'AND' => [ 'id_banner' => $row['id'], 'id_lang' => $langId ]
] );
$row['languages'] = $langData ?: [];
$banners[] = $row;
}
}
\Shared\Cache\CacheHandler::store( 'banners', $banners );
return $banners;
}
public function mainBanner( $langId )
{
$cacheKey = "main_banner:$langId";
if ( $banner = \Shared\Cache\CacheHandler::fetch( $cacheKey ) )
return $banner;
$results = $this->db->query(
'SELECT id, name FROM pp_banners WHERE status = 1 AND ( date_start <= \'' . date( 'Y-m-d' ) . '\' OR date_start IS NULL ) AND ( date_end >= \'' . date( 'Y-m-d' ) . '\' OR date_end IS NULL ) AND home_page = 1 ORDER BY date_end ASC LIMIT 1'
)->fetchAll( \PDO::FETCH_ASSOC );
if ( !is_array( $results ) || empty( $results ) ) return null;
$banner = $results[0];
$langData = $this->db->get( 'pp_banners_langs', '*', [
'AND' => [ 'id_banner' => $banner['id'], 'id_lang' => $langId ]
] );
$banner['languages'] = $langData ?: [];
\Shared\Cache\CacheHandler::store( $cacheKey, $banner );
return $banner;
}
// -------------------------------------------------------------------------
// Zapis / usuwanie
// -------------------------------------------------------------------------
public function bannerSave( $bannerId, $name, $status, $dateStart, $dateEnd, $homePage, $src, $url, $html, $text )
{
$languages = $this->db->select( 'pp_langs', '*', [ 'status' => 1, 'ORDER' => [ 'o' => 'ASC' ] ] );
if ( !is_array( $languages ) ) $languages = [];
$langCount = count( $languages );
if ( !$bannerId )
{
$this->db->insert( 'pp_banners', [
'name' => $name,
'status' => $status == 'on' ? 1 : 0,
'date_start' => $dateStart ? $dateStart : null,
'date_end' => $dateEnd ? $dateEnd : null,
'home_page' => $homePage == 'on' ? 1 : 0,
] );
$bannerId = $this->db->id();
if ( !$bannerId ) return false;
foreach ( $languages as $i => $lang )
{
$this->db->insert( 'pp_banners_langs', [
'id_banner' => $bannerId,
'id_lang' => $lang['id'],
'src' => $langCount > 1 ? $src[ $i ] : $src,
'url' => $langCount > 1 ? $url[ $i ] : $url,
'html' => $langCount > 1 ? $html[ $i ] : $html,
'text' => $langCount > 1 ? $text[ $i ] : $text,
] );
}
}
else
{
$this->db->update( 'pp_banners', [
'name' => $name,
'status' => $status == 'on' ? 1 : 0,
'date_start' => $dateStart ? $dateStart : null,
'date_end' => $dateEnd ? $dateEnd : null,
'home_page' => $homePage == 'on' ? 1 : 0,
], [ 'id' => $bannerId ] );
$this->db->delete( 'pp_banners_langs', [ 'id_banner' => $bannerId ] );
foreach ( $languages as $i => $lang )
{
$this->db->insert( 'pp_banners_langs', [
'id_banner' => $bannerId,
'id_lang' => $lang['id'],
'src' => $langCount > 1 ? $src[ $i ] : $src,
'url' => $langCount > 1 ? $url[ $i ] : $url,
'html' => $langCount > 1 ? $html[ $i ] : $html,
'text' => $langCount > 1 ? $text[ $i ] : $text,
] );
}
}
\S::delete_cache();
return $bannerId;
}
public function bannerDelete( $bannerId )
{
$result = $this->db->delete( 'pp_banners', [ 'id' => $bannerId ] );
\S::delete_cache();
return $result;
}
}

110
autoload/Domain/Scontainers/ScontainersRepository.php Normal file
View File

@@ -0,0 +1,110 @@
<?php
namespace Domain\Scontainers;
class ScontainersRepository
{
private $db;
public function __construct( $db )
{
$this->db = $db;
}
// -------------------------------------------------------------------------
// Odczyt
// -------------------------------------------------------------------------
public function containerDetails( $containerId )
{
$container = $this->db->get( 'pp_scontainers', '*', [ 'id' => $containerId ] );
if ( !$container ) return null;
$langs = $this->db->select( 'pp_scontainers_langs', '*', [ 'container_id' => $containerId ] );
$container['languages'] = [];
if ( is_array( $langs ) )
foreach ( $langs as $lang )
$container['languages'][ $lang['lang_id'] ] = $lang;
return $container;
}
public function scontainerByLang( $scontainerId, $langId )
{
$cacheKey = "scontainer_details:$scontainerId:$langId";
if ( $scontainer = \Shared\Cache\CacheHandler::fetch( $cacheKey ) )
return $scontainer;
$scontainer = $this->db->get( 'pp_scontainers', '*', [ 'id' => $scontainerId ] );
if ( !$scontainer ) return null;
$langData = $this->db->select( 'pp_scontainers_langs', '*', [
'AND' => [ 'container_id' => $scontainerId, 'lang_id' => $langId ]
] );
$scontainer['languages'] = is_array( $langData ) ? $langData : [];
\Shared\Cache\CacheHandler::store( $cacheKey, $scontainer );
return $scontainer;
}
// -------------------------------------------------------------------------
// Zapis / usuwanie
// -------------------------------------------------------------------------
public function containerSave( $containerId, $title, $text, $status, $showTitle, $src, $html )
{
$languages = $this->db->select( 'pp_langs', '*', [ 'status' => 1, 'ORDER' => [ 'o' => 'ASC' ] ] );
if ( !is_array( $languages ) ) $languages = [];
$langCount = count( $languages );
if ( !$containerId )
{
$this->db->insert( 'pp_scontainers', [
'status' => $status == 'on' ? 1 : 0,
'show_title' => $showTitle == 'on' ? 1 : 0,
'src' => $src,
] );
$containerId = $this->db->id();
if ( !$containerId ) return false;
foreach ( $languages as $i => $lang )
{
$this->db->insert( 'pp_scontainers_langs', [
'container_id' => $containerId,
'lang_id' => $lang['id'],
'title' => $langCount > 1 ? $title[ $i ] : $title,
'text' => $langCount > 1 ? $text[ $i ] : $text,
'html' => $langCount > 1 ? $html[ $i ] : $html,
] );
}
}
else
{
$this->db->update( 'pp_scontainers', [
'status' => $status == 'on' ? 1 : 0,
'show_title' => $showTitle == 'on' ? 1 : 0,
'src' => $src,
], [ 'id' => $containerId ] );
$this->db->delete( 'pp_scontainers_langs', [ 'container_id' => $containerId ] );
foreach ( $languages as $i => $lang )
{
$this->db->insert( 'pp_scontainers_langs', [
'container_id' => $containerId,
'lang_id' => $lang['id'],
'title' => $langCount > 1 ? $title[ $i ] : $title,
'text' => $langCount > 1 ? $text[ $i ] : $text,
'html' => $langCount > 1 ? $html[ $i ] : $html,
] );
}
}
\S::delete_cache();
return $containerId;
}
public function containerDelete( $containerId )
{
return $this->db->delete( 'pp_scontainers', [ 'id' => $containerId ] );
}
}

116
autoload/admin/factory/class.Banners.php
View File

@@ -7,123 +7,21 @@ class Banners
public static function banner_delete( $banner_id )
{
global $mdb;
$result = $mdb -> delete( 'pp_banners', [ 'id' => (int) $banner_id ] );
\S::delete_cache();
return $result;
$repo = new \Domain\Banners\BannersRepository($mdb);
return $repo->bannerDelete($banner_id);
}
public static function banner_save( $banner_id, $name, $status, $date_start, $date_end, $home_page, $src, $url, $html, $text )
{
global $mdb;
if ( !$banner_id )
{
$mdb -> insert( 'pp_banners', [
'name' => $name,
'status' => $status == 'on' ? 1 : 0,
'date_start' => $date_start != '' ? $date_start : null,
'date_end' => $date_end != '' ? $date_end : null,
'home_page' => $home_page == 'on' ? 1 : 0
] );
$id = $mdb -> id();
if ( $id )
{
$i = 0;
$results = $mdb -> select( 'pp_langs', [ 'id' ], [ 'status' => 1, 'ORDER' => [ 'o' => 'ASC' ] ] );
if ( is_array( $results ) and count( $results ) > 1 ) foreach ( $results as $row )
{
$mdb -> insert( 'pp_banners_langs', [
'id_banner' => (int)$id,
'id_lang' => $row['id'],
'src' => $src[ $i ],
'url' => $url[ $i ],
'html' => $html[ $i ],
'text' => $text[ $i ]
] );
$i++;
}
else if ( is_array( $results ) and count( $results ) == 1 ) foreach ( $results as $row )
{
$mdb -> insert( 'pp_banners_langs', [
'id_banner' => (int)$id,
'id_lang' => $row['id'],
'src' => $src,
'url' => $url,
'html' => $html,
'text' => $text
] );
}
\S::delete_cache();
return $id;
}
}
else
{
$mdb -> update( 'pp_banners',
[
'name' => $name,
'status' => $status == 'on' ? 1 : 0,
'date_start' => $date_start != '' ? $date_start : null,
'date_end' => $date_end != '' ? $date_end : null,
'home_page' => $home_page == 'on' ? 1 : 0
], [
'id' => (int) $banner_id
] );
$mdb -> delete( 'pp_banners_langs', [ 'id_banner' => (int)$banner_id ] );
$i = 0;
$results = $mdb -> select( 'pp_langs', [ 'id' ], [ 'status' => 1, 'ORDER' => [ 'o' => 'ASC' ] ] );
if ( is_array( $results ) and count( $results ) > 1 ) foreach ( $results as $row )
{
$mdb -> insert( 'pp_banners_langs', [
'id_banner' => (int)$banner_id,
'id_lang' => $row['id'],
'src' => $src[ $i ],
'url' => $url[ $i ],
'html' => $html[ $i ],
'text' => $text[ $i ]
] );
$i++;
}
else if ( is_array( $results ) and count( $results ) == 1 ) foreach ( $results as $row )
{
$mdb -> insert( 'pp_banners_langs', [
'id_banner' => (int)$banner_id,
'id_lang' => $row['id'],
'src' => $src,
'url' => $url,
'html' => $html,
'text' => $text
] );
}
\S::delete_cache();
return $banner_id;
}
return false;
$repo = new \Domain\Banners\BannersRepository($mdb);
return $repo->bannerSave($banner_id, $name, $status, $date_start, $date_end, $home_page, $src, $url, $html, $text);
}
public static function banner_details( $id_banner )
{
global $mdb;
$banner = $mdb -> get( 'pp_banners', '*', [ 'id' => (int)$id_banner ] );
$results = $mdb -> select( 'pp_banners_langs', '*', [ 'id_banner' => (int)$id_banner ] );
if ( is_array( $results ) ) foreach ( $results as $row )
$banner['languages'][$row['id_lang']] = $row;
return $banner;
$repo = new \Domain\Banners\BannersRepository($mdb);
return $repo->bannerDetails($id_banner);
}
}
?>
}

106
autoload/admin/factory/class.Scontainers.php
View File

@@ -7,115 +7,21 @@ class Scontainers
public static function container_delete( $container_id )
{
global $mdb;
return $mdb -> delete( 'pp_scontainers', [ 'id' => (int) $container_id ] );
$repo = new \Domain\Scontainers\ScontainersRepository($mdb);
return $repo->containerDelete($container_id);
}
public static function container_save( $container_id, $title, $text, $status, $show_title, $src, $html )
{
global $mdb;
if ( !$container_id )
{
$mdb -> insert( 'pp_scontainers',
[
'status' => $status == 'on' ? 1 : 0,
'show_title' => $show_title == 'on' ? 1 : 0,
'src' => $src
] );
$id = $mdb -> id();
if ( $id )
{
$i = 0;
$results = $mdb -> select( 'pp_langs', [ 'id' ], [ 'status' => 1, 'ORDER' => [ 'o' => 'ASC' ] ] );
if ( is_array( $results ) and count( $results ) > 1 ) foreach ( $results as $row )
{
$mdb -> insert( 'pp_scontainers_langs',
[
'container_id' => (int) $id,
'lang_id' => $row['id'],
'title' => $title[$i],
'text' => $text[$i],
'html' => $html[$i]
] );
$i++;
}
else if ( is_array( $results ) and count( $results ) == 1 ) foreach ( $results as $row )
{
$mdb -> insert( 'pp_scontainers_langs', [
'container_id' => (int) $id,
'lang_id' => $row['id'],
'title' => $title,
'text' => $text,
'html' => $html
] );
}
\S::delete_cache();
return $id;
}
}
else
{
$mdb -> update( 'pp_scontainers',
[
'status' => $status == 'on' ? 1 : 0,
'show_title' => $show_title == 'on' ? 1 : 0,
'src' => $src
],
[
'id' => (int) $container_id
] );
$mdb -> delete( 'pp_scontainers_langs',
[ 'container_id' => (int) $container_id ] );
$i = 0;
$results = $mdb -> select( 'pp_langs', [ 'id' ], [ 'status' => 1, 'ORDER' => [ 'o' => 'ASC' ] ] );
if ( is_array( $results ) and count( $results ) > 1 ) foreach ( $results as $row )
{
$mdb -> insert( 'pp_scontainers_langs',
[
'container_id' => (int) $container_id,
'lang_id' => $row['id'],
'title' => $title[$i],
'text' => $text[$i],
'html' => $html[$i]
] );
$i++;
}
else if ( is_array( $results ) and count( $results ) == 1 ) foreach ( $results as $row )
{
$mdb -> insert( 'pp_scontainers_langs',
[
'container_id' => (int) $container_id,
'lang_id' => $row['id'],
'title' => $title,
'text' => $text,
'html' => $html
] );
}
\S::delete_cache();
return $container_id;
}
$repo = new \Domain\Scontainers\ScontainersRepository($mdb);
return $repo->containerSave($container_id, $title, $text, $status, $show_title, $src, $html);
}
public static function container_details( $container_id )
{
global $mdb;
$container = $mdb -> get( 'pp_scontainers', '*', [ 'id' => (int) $container_id ] );
$results = $mdb -> select( 'pp_scontainers_langs', '*', [ 'container_id' => (int) $container_id ] );
if ( is_array( $results ) ) foreach ( $results as $row )
$container['languages'][$row['lang_id']] = $row;
return $container;
$repo = new \Domain\Scontainers\ScontainersRepository($mdb);
return $repo->containerDetails($container_id);
}
}

54
autoload/front/factory/class.Banners.php
View File

@@ -6,58 +6,14 @@ class Banners
public static function banners()
{
global $mdb, $lang;
if ( !$banners = \Cache::fetch( 'banners' ) )
{
$results = $mdb -> query( 'SELECT '
. 'id, name '
. 'FROM '
. 'pp_banners '
. 'WHERE '
. 'status = 1 '
. 'AND '
. '( date_start <= \'' . date( 'Y-m-d' ) . '\' OR date_start IS NULL ) '
. 'AND '
. '( date_end >= \'' . date( 'Y-m-d' ) . '\' OR date_end IS NULL ) '
. 'AND '
. 'home_page = 0' ) -> fetchAll();
if ( is_array( $results ) and !empty( $results ) ) foreach ( $results as $row )
{
$row['languages'] = $mdb -> get( 'pp_banners_langs', '*', [ 'AND' => [ 'id_banner' => (int)$row['id'], 'id_lang' => $lang[0] ] ] );
$banners[] = $row;
}
\Cache::store( 'banners', $banners );
}
return $banners;
$repo = new \Domain\Banners\BannersRepository($mdb);
return $repo->activeBanners($lang[0]);
}
public static function main_banner()
{
global $mdb, $lang;
if ( !$banner = \Cache::fetch( "main_banner:" . $lang[0] ) )
{
$banner = $mdb -> query( 'SELECT '
. '* '
. 'FROM '
. 'pp_banners '
. 'WHERE '
. 'status = 1 '
. 'AND '
. '( date_start <= \'' . date( 'Y-m-d' ) . '\' OR date_start IS NULL ) '
. 'AND '
. '( date_end >= \'' . date( 'Y-m-d' ) . '\' OR date_end IS NULL ) '
. 'AND '
. 'home_page = 1 '
. 'ORDER BY '
. 'date_end ASC '
. 'LIMIT 1' ) -> fetchAll();
$banner = $banner[0];
if ( $banner )
$banner['languages'] = $mdb -> get( 'pp_banners_langs', '*', [ 'AND' => [ 'id_banner' => (int)$banner['id'], 'id_lang' => $lang[0] ] ] );
\Cache::store( "main_banner:" . $lang[0], $banner );
}
return $banner;
$repo = new \Domain\Banners\BannersRepository($mdb);
return $repo->mainBanner($lang[0]);
}
}

17
autoload/front/factory/class.Scontainers.php
View File

@@ -6,18 +6,7 @@ class Scontainers
public static function scontainer_details( $scontainer_id )
{
global $mdb, $lang;
if ( !$scontainer = \Cache::fetch( "scontainer_details:$scontainer_id:" . $lang[0] ) )
{
$scontainer = $mdb -> get( 'pp_scontainers', '*', [ 'id' => (int)$scontainer_id ] );
$results = $mdb -> select( 'pp_scontainers_langs', '*', [ 'AND' => [ 'container_id' => (int)$scontainer_id, 'lang_id' => $lang[0] ] ] );
if ( is_array( $results ) ) foreach ( $results as $row )
$scontainer['languages'] = $row;
\Cache::store( "scontainer_details:$scontainer_id:" . $lang[0], $scontainer );
}
return $scontainer;
$repo = new \Domain\Scontainers\ScontainersRepository($mdb);
return $repo->scontainerByLang($scontainer_id, $lang[0]);
}
}
}