From d0171c90b64ac25287c513d6dd1e33087a32f4d4 Mon Sep 17 00:00:00 2001 From: Daniel Date: Mon, 2 Oct 2023 15:36:04 +0200 Subject: [PATCH] moced patches --- 1-deployBetaProBuddy.sh | 3 + 1-deployLiveProBuddy.sh | 55 +++++++++++++++++++ .../patches/1addActiveStateToProfile.php | 4 +- tools/patches/1addActiveStateToProfile.php | 38 ------------- tools/patches/2addDbTermsConditionsToTeam.php | 19 ------- tools/patches/3addTermsAcceptedToProfile.php | 38 ------------- tools/patches/4addDbNewUsersInactive.php | 20 ------- .../old/addCategoryIdsJsToAppointments.php | 44 --------------- ...ddDateTimeRejectToExistingAppointments.php | 39 ------------- .../old/addGeneralCourseCategoryToTeam.php | 41 -------------- tools/patches/old/addPublicIdToProfile.php | 51 ----------------- .../old/addTeamCategoriesToAdminProfiles.php | 50 ----------------- ...placeCategoryByCategoryIdInAppointment.php | 51 ----------------- 13 files changed, 60 insertions(+), 393 deletions(-) create mode 100644 1-deployLiveProBuddy.sh delete mode 100644 tools/patches/1addActiveStateToProfile.php delete mode 100644 tools/patches/2addDbTermsConditionsToTeam.php delete mode 100644 tools/patches/3addTermsAcceptedToProfile.php delete mode 100644 tools/patches/4addDbNewUsersInactive.php delete mode 100644 tools/patches/old/addCategoryIdsJsToAppointments.php delete mode 100644 tools/patches/old/addDateTimeRejectToExistingAppointments.php delete mode 100644 tools/patches/old/addGeneralCourseCategoryToTeam.php delete mode 100644 tools/patches/old/addPublicIdToProfile.php delete mode 100644 tools/patches/old/addTeamCategoriesToAdminProfiles.php delete mode 100644 tools/patches/old/replaceCategoryByCategoryIdInAppointment.php diff --git a/1-deployBetaProBuddy.sh b/1-deployBetaProBuddy.sh index 8621bc5..89cf04f 100644 --- a/1-deployBetaProBuddy.sh +++ b/1-deployBetaProBuddy.sh @@ -28,6 +28,9 @@ cp -rf /var/www/vhosts/spawntree.de/probuddy.spawntree.de/git_repositories/beta- rm -rf /var/www/vhosts/spawntree.de/probuddy.spawntree.de/httpdocs/src/server/dependencies cp -rf /var/www/vhosts/spawntree.de/probuddy.spawntree.de/git_repositories/beta-probuddy/src/server/dependencies /var/www/vhosts/spawntree.de/probuddy.spawntree.de/httpdocs/src/server +rm -rf /var/www/vhosts/spawntree.de/probuddy.spawntree.de/httpdocs/src/server/patches +cp -rf /var/www/vhosts/spawntree.de/probuddy.spawntree.de/git_repositories/beta-probuddy/src/server/patches /var/www/vhosts/spawntree.de/probuddy.spawntree.de/httpdocs/src/server + rm -rf /var/www/vhosts/spawntree.de/probuddy.spawntree.de/httpdocs/src/server/server/cli cp -rf /var/www/vhosts/spawntree.de/probuddy.spawntree.de/git_repositories/beta-probuddy/src/server/server/cli /var/www/vhosts/spawntree.de/probuddy.spawntree.de/httpdocs/src/server/server diff --git a/1-deployLiveProBuddy.sh b/1-deployLiveProBuddy.sh new file mode 100644 index 0000000..dc4cdf5 --- /dev/null +++ b/1-deployLiveProBuddy.sh @@ -0,0 +1,55 @@ +#!/bin/bash + +cd /www/htdocs/v034011/projects/probuddy/git_repository/probuddy-master +git pull + +echo "$(tput setab 2)pro-buddy has been PULLED$(tput sgr 0)" + +rm -rf /www/htdocs/v034011/projects/probuddy/client +cp -rf /www/htdocs/v034011/projects/probuddy/git_repository/probuddy-master/src/client /www/htdocs/v034011/projects/probuddy + +rm -rf /www/htdocs/v034011/projects/probuddy/server/admin/AHDMN +cp -rf /www/htdocs/v034011/projects/probuddy/git_repository/probuddy-master/src/server/admin/AHDMN /www/htdocs/v034011/projects/probuddy/server/admin + +rm -rf /www/htdocs/v034011/projects/probuddy/server/admin/libs +cp -rf /www/htdocs/v034011/projects/probuddy/git_repository/probuddy-master/src/server/admin/libs /www/htdocs/v034011/projects/probuddy/server/admin + +rm -rf /www/htdocs/v034011/projects/probuddy/server/admin/services +cp -rf /www/htdocs/v034011/projects/probuddy/git_repository/probuddy-master/src/server/admin/services /www/htdocs/v034011/projects/probuddy/server/admin + +rm -rf /www/htdocs/v034011/projects/probuddy/server/admin/boot.php +cp -rf /www/htdocs/v034011/projects/probuddy/git_repository/probuddy-master/src/server/admin/boot.php /www/htdocs/v034011/projects/probuddy/server/admin + +rm -rf /www/htdocs/v034011/projects/probuddy/server/dependencies +cp -rf /www/htdocs/v034011/projects/probuddy/git_repository/probuddy-master/src/server/dependencies /www/htdocs/v034011/projects/probuddy/server + +rm -rf /www/htdocs/v034011/projects/probuddy/server/patches +cp -rf /www/htdocs/v034011/projects/probuddy/git_repository/probuddy-master/src/server/patches /www/htdocs/v034011/projects/probuddy/server + +rm -rf /www/htdocs/v034011/projects/probuddy/server/server/cli +cp -rf /www/htdocs/v034011/projects/probuddy/git_repository/probuddy-master/src/server/server/cli /www/htdocs/v034011/projects/probuddy/server/server + +rm -rf /www/htdocs/v034011/projects/probuddy/server/server/control +cp -rf /www/htdocs/v034011/projects/probuddy/git_repository/probuddy-master/src/server/server/control /www/htdocs/v034011/projects/probuddy/server/server + +rm -rf /www/htdocs/v034011/projects/probuddy/server/server/core +cp -rf /www/htdocs/v034011/projects/probuddy/git_repository/probuddy-master/src/server/server/core /www/htdocs/v034011/projects/probuddy/server/server + +rm -rf /www/htdocs/v034011/projects/probuddy/server/server/job +cp -rf /www/htdocs/v034011/projects/probuddy/git_repository/probuddy-master/src/server/server/job /www/htdocs/v034011/projects/probuddy/server/server + +rm -rf /www/htdocs/v034011/projects/probuddy/server/server/template +cp -rf /www/htdocs/v034011/projects/probuddy/git_repository/probuddy-master/src/server/server/template /www/htdocs/v034011/projects/probuddy/server/server + +rm -rf /www/htdocs/v034011/projects/probuddy/server/server/utils +cp -rf /www/htdocs/v034011/projects/probuddy/git_repository/probuddy-master/src/server/server/utils /www/htdocs/v034011/projects/probuddy/server/server + +rm -rf /www/htdocs/v034011/projects/probuddy/server/shared +cp -rf /www/htdocs/v034011/projects/probuddy/git_repository/probuddy-master/src/server/shared /www/htdocs/v034011/projects/probuddy/server + +echo "$(tput setab 2)Files have been copied$(tput sgr 0)" + + +echo "$(tput setab 7)$(tput setaf 1)THINK ABOUT POSSIBLE PATCHES!" + +echo "You have updated probuddy live!$(tput sgr 0)" diff --git a/src/server/patches/1addActiveStateToProfile.php b/src/server/patches/1addActiveStateToProfile.php index 68af861..eba11b2 100644 --- a/src/server/patches/1addActiveStateToProfile.php +++ b/src/server/patches/1addActiveStateToProfile.php @@ -1,7 +1,7 @@ query( $sql ); - $res = $stmt->fetchAll(); - - $db->beginTransaction(); - foreach( $res as $row ) - { - if ( is_array( $row ) && isset( $row[ 'id' ] ) ) - { - - $entProfile = TB_Shared_Ent_TeamData_Profile::get( $row[ 'id' ] ); - $resTeam = []; - foreach ($entProfile->teams_js as $team) { - $tmpTeam = $team; - $tmpTeam['status'] = 'active'; - $resTeam[] = $tmpTeam; - } - $entProfile->teams_js = $resTeam; - $entProfile->save(); - unset($team); - unset( $entProfile ); - } - } - $db->commit(); - - echo "DONE..."; -} - -patch_addActiveStateToProfile(); \ No newline at end of file diff --git a/tools/patches/2addDbTermsConditionsToTeam.php b/tools/patches/2addDbTermsConditionsToTeam.php deleted file mode 100644 index 58a4447..0000000 --- a/tools/patches/2addDbTermsConditionsToTeam.php +++ /dev/null @@ -1,19 +0,0 @@ -query( $sql ); - - echo "DONE..."; -} - -patch(); \ No newline at end of file diff --git a/tools/patches/3addTermsAcceptedToProfile.php b/tools/patches/3addTermsAcceptedToProfile.php deleted file mode 100644 index 5735c78..0000000 --- a/tools/patches/3addTermsAcceptedToProfile.php +++ /dev/null @@ -1,38 +0,0 @@ -query( $sql ); - $res = $stmt->fetchAll(); - - $db->beginTransaction(); - foreach( $res as $row ) - { - if ( is_array( $row ) && isset( $row[ 'id' ] ) ) - { - - $entProfile = TB_Shared_Ent_TeamData_Profile::get( $row[ 'id' ] ); - $resTeam = []; - foreach ($entProfile->teams_js as $team) { - $tmpTeam = $team; - $tmpTeam['terms_accepted'] = 0; - $resTeam[] = $tmpTeam; - } - $entProfile->teams_js = $resTeam; - $entProfile->save(); - unset($team); - unset( $entProfile ); - } - } - $db->commit(); - - echo "DONE..."; -} - -patch_addTermsAcceptedToProfile(); \ No newline at end of file diff --git a/tools/patches/4addDbNewUsersInactive.php b/tools/patches/4addDbNewUsersInactive.php deleted file mode 100644 index eef502c..0000000 --- a/tools/patches/4addDbNewUsersInactive.php +++ /dev/null @@ -1,20 +0,0 @@ -query( $sql ); - - $sql = "UPDATE team SET new_users_inactive = 0 WHERE 1"; - $stmt = $db->query( $sql ); - echo "DONE..."; -} - -patch(); \ No newline at end of file diff --git a/tools/patches/old/addCategoryIdsJsToAppointments.php b/tools/patches/old/addCategoryIdsJsToAppointments.php deleted file mode 100644 index f77271a..0000000 --- a/tools/patches/old/addCategoryIdsJsToAppointments.php +++ /dev/null @@ -1,44 +0,0 @@ -query( $sql ); - $res = $stmt->fetchAll(); - - foreach( $res as $row ) - { - if ( is_array( $row ) && isset( $row[ 'id' ] ) ) - { - $db->beginTransaction(); - $entApp = TB_Shared_Ent_TeamData_Appointment::get( $row[ 'id' ] ); - if ( $entApp instanceof TB_Shared_Ent_TeamData_Appointment ) - { - if ( !is_null( $entApp->category_id ) ) - { - $entApp->category_ids_js = array( $entApp->category_id ); - $entApp->save(); - } - } - $db->commit(); - } - } - - echo "DONE..."; -} - -patch_addCategoryIdsJsToAppointments(); diff --git a/tools/patches/old/addDateTimeRejectToExistingAppointments.php b/tools/patches/old/addDateTimeRejectToExistingAppointments.php deleted file mode 100644 index 847546a..0000000 --- a/tools/patches/old/addDateTimeRejectToExistingAppointments.php +++ /dev/null @@ -1,39 +0,0 @@ -query( $sql ); - $res = $stmt->fetchAll(); - - foreach( $res as $row ) - { - if ( is_array( $row ) && isset( $row[ 'id' ] ) ) - { - $db->beginTransaction(); - $entAppointment = TB_Shared_Ent_TeamData_Appointment::get( $row[ 'id' ] ); - $entAppointment->deadline_reject_dt = $entAppointment->start_dt; - $entAppointment->save(); - $db->commit(); - unset( $entAppointment ); - } - } - - echo "DONE..."; -} - -patch_addDateTimeRejectToExistingAppointments(); diff --git a/tools/patches/old/addGeneralCourseCategoryToTeam.php b/tools/patches/old/addGeneralCourseCategoryToTeam.php deleted file mode 100644 index 0b0c167..0000000 --- a/tools/patches/old/addGeneralCourseCategoryToTeam.php +++ /dev/null @@ -1,41 +0,0 @@ -id . '-0'; - $generalCategory = $team->getCourseCategoryDataById( $generalCategoryId ); - if ( is_null( $generalCategory ) ) - { - $team->addCourseCategory( [ 'id' => $generalCategoryId, 'name' => 'Allgemein' ] ); - $team->save(); - } - - unset( $team ); - } - - echo "DONE..."; -} - -patch_addGeneralCourseCategoryToTeam(); diff --git a/tools/patches/old/addPublicIdToProfile.php b/tools/patches/old/addPublicIdToProfile.php deleted file mode 100644 index 47b6f03..0000000 --- a/tools/patches/old/addPublicIdToProfile.php +++ /dev/null @@ -1,51 +0,0 @@ -query( $sql ); - $res = $stmt->fetchAll(); - - foreach( $res as $row ) - { - if ( is_array( $row ) && isset( $row[ 'id' ] ) ) - { - $db->beginTransaction(); - $entProfile = TB_Shared_Ent_TeamData_Profile::get( $row[ 'id' ] ); - if ( $entProfile instanceof TB_Shared_Ent_TeamData_Profile ) - { - $entProfile->public_id = TB_Server_Utils_Helper::getToken(64); - $entProfile->save(); - } - $db->commit(); - } - } - - echo "DONE..."; -} - -patch_AddPublicIdToProfiles(); diff --git a/tools/patches/old/addTeamCategoriesToAdminProfiles.php b/tools/patches/old/addTeamCategoriesToAdminProfiles.php deleted file mode 100644 index c14ddbe..0000000 --- a/tools/patches/old/addTeamCategoriesToAdminProfiles.php +++ /dev/null @@ -1,50 +0,0 @@ -getTeamIds(); - foreach( $tIds as $tId ) - { - if ( $ap->isAdminOfTeam( $tId ) ) - { - /** @var TB_Shared_Ent_TeamData_Team $team */ - $team = TB_Shared_Ent_TeamData_Team::get( $tId ); - if ( is_array( $team->course_categories_js ) ) - { - $teamCategoryIds = $ap->getTeamIds(); - foreach( $team->course_categories_js as $courseCategory ) - { - $ap->addToCategoryId( $courseCategory[ 'id' ] ); - } - - $ap->save(); - } - } - } - } - - - echo "DONE..."; -} - -patch_AddTeamCategoriesToAdminProfiles(); diff --git a/tools/patches/old/replaceCategoryByCategoryIdInAppointment.php b/tools/patches/old/replaceCategoryByCategoryIdInAppointment.php deleted file mode 100644 index 589256f..0000000 --- a/tools/patches/old/replaceCategoryByCategoryIdInAppointment.php +++ /dev/null @@ -1,51 +0,0 @@ -team_id ); - if ( $team ) - { - $categoryId = $team->id . '-0'; - foreach( $team->course_categories_js as $category ) - { - if ( $category[ 'name' ] === $a->category ) - { - $categoryId = $category[ 'id' ]; - break; - } - } - if ( $categoryId ) - { - //$a->category = NULL; - $a->category_id = $categoryId; - $a->save(); - } - unset( $team ); - } - } - - echo "DONE..."; -} - -patch_replaceCategoryByCategoryIdInAppointment();