Skip to content

Optimize badge check #136

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nickfreese wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Optimize badge check #136

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c315753
optimize badge check by loading all ledger entries for game term at t…
nickfreese Jun 26, 2025
b4fbdb6
fix regex statements. comment out original collection badge isset check
nickfreese Jul 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
111 changes: 89 additions & 22 deletions summergame.module
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1876,6 +1876,14 @@ function summergame_player_check_badges($pid, $game_term) {
$player_bids[] = $player_badge->bid;
}

$points_rows = $db->query('SELECT * FROM sg_ledger WHERE pid = :pid AND game_term = :game_term ORDER BY timestamp', [':pid'=>$pid, ':game_term' => $game_term])->fetchAll();

while ($player_badge = $res->fetchAll()) {
$player_bids[] = $player_badge->bid;
}



$res = $db->query("SELECT gt.entity_id AS bid, f.field_badge_formula_value AS formula " .
"FROM node_field_data n, node__field_badge_game_term gt, node__field_badge_formula f " .
"WHERE n.nid = gt.entity_id " .
Expand All @@ -1891,7 +1899,14 @@ function summergame_player_check_badges($pid, $game_term) {
// Self Award Badge
$tasks = explode('|', substr($badge->formula, strlen('SELFAWARD:')));
$total_count = count($tasks);
$player_count = $db->query("SELECT COUNT(lid) AS player_count FROM `sg_ledger` WHERE `pid` = $pid AND metadata LIKE '%badgetask:$badge->bid%'")->fetchField();
//$player_count = $db->query("SELECT COUNT(lid) AS player_count FROM `sg_ledger` WHERE `pid` = $pid AND metadata LIKE '%badgetask:$badge->bid%'")->fetchField();
$player_count = 0;
foreach ($points_rows as $points) {
if (str_contains($points->metadata,'badgetask:'.$badge->bid)) {
$player_count++;
}
}

if ($player_count >= $total_count) {
$awarded = summergame_player_award_badge($pid, $badge->bid);
}
Expand Down Expand Up @@ -1933,10 +1948,24 @@ function summergame_player_check_badges($pid, $game_term) {
elseif (strpos($badge->formula, '^^')) {
// Multiple days of a ledger type formula (streak)
list($count_limit, $text_pattern) = explode('^^', $badge->formula);
$lid_count = $db->query("SELECT COUNT(DISTINCT FROM_UNIXTIME(`timestamp`, '%j')) AS lid_count FROM sg_ledger WHERE pid = $pid " .
/*$lid_count = $db->query("SELECT COUNT(DISTINCT FROM_UNIXTIME(`timestamp`, '%j')) AS lid_count FROM sg_ledger WHERE pid = $pid " .
"AND (type LIKE :text_pattern OR metadata LIKE :gamecode_pattern) AND game_term = :game_term",
[':text_pattern' => $text_pattern, ':gamecode_pattern' => "gamecode:$text_pattern%", ':game_term' => $game_term])->fetchObject();
if ($lid_count->lid_count >= $count_limit) {
[':text_pattern' => $text_pattern, ':gamecode_pattern' => "gamecode:$text_pattern%", ':game_term' => $game_term])->fetchObject();*/
$distict_days = [];
$distinct_count = 0;

$wc_text_pattern = "/" . str_replace("%", ".*", $text_pattern) . "$/";
$wc_gamecode_pattern = "/" . str_replace("%", ".*", "gamecode:".$text_pattern."%") . "/";

foreach ($points_rows as $points) {
$day = date('z', $points->timestamp);

if (!in_array($day, $distict_days) && (preg_match($wc_text_pattern, $points->type) || preg_match($wc_gamecode_pattern, $points->metadata)) ) {
$distict_days[] = $day;
$distinct_count++;
}
}
if ($distinct_count >= $count_limit) {
$awarded = summergame_player_award_badge($pid, $badge->bid);
}
}
Expand All @@ -1946,51 +1975,89 @@ function summergame_player_check_badges($pid, $game_term) {
if (count($formula_parts) == 2) {
// Default multiple of a ledger pattern (type field or gamecode pattern)
list($count_limit, $text_pattern) = $formula_parts;
$lid_count = $db->query("SELECT COUNT(lid) AS lid_count FROM sg_ledger WHERE pid = $pid " .
/*$lid_count = $db->query("SELECT COUNT(lid) AS lid_count FROM sg_ledger WHERE pid = $pid " .
"AND (type LIKE :text_pattern OR metadata LIKE :gamecode_pattern) AND game_term = :game_term",
[':text_pattern' => $text_pattern, ':gamecode_pattern' => "gamecode:$text_pattern%", ':game_term' => $game_term])->fetchObject();
if ($lid_count->lid_count >= $count_limit) {
[':text_pattern' => $text_pattern, ':gamecode_pattern' => "gamecode:$text_pattern%", ':game_term' => $game_term])->fetchObject();*/
$lid_count = 0;
$wc_text_pattern = "/" . str_replace("%", ".*", $text_pattern) . "$/";
$wc_gamecode_pattern = "/" . str_replace("%", ".*", "gamecode:".$text_pattern."%") . "$/";
foreach ($points_rows as $points) {
if ( preg_match($wc_text_pattern, $points->type) || preg_match($wc_gamecode_pattern, $points->metadata) ) {
$lid_count++;
}

}

if ($lid_count >= $count_limit) {
$awarded = summergame_player_award_badge($pid, $badge->bid);
}
}
elseif (count($formula_parts) == 3) {
// New multiple of a ledger pattern (count::field::pattern)
list($count_limit, $ledger_field, $text_pattern) = $formula_parts;
$lid_count = $db->query("SELECT COUNT(lid) AS lid_count FROM sg_ledger WHERE pid = $pid " .
/*$lid_count = $db->query("SELECT COUNT(lid) AS lid_count FROM sg_ledger WHERE pid = $pid " .
'AND game_term = :game_term ' .
"AND $ledger_field LIKE :text_pattern",
[':game_term' => $game_term, ':text_pattern' => $text_pattern])->fetchObject();
if ($lid_count->lid_count >= $count_limit) {
[':game_term' => $game_term, ':text_pattern' => $text_pattern])->fetchObject();*/

$lid_count = 0;
$wc_text_pattern = "/" . str_replace("%", ".*", $text_pattern) . "/";

foreach ($points_rows as $points) {
if (preg_match($wc_text_pattern, $points->{$ledger_field})) {
$lid_count++;
}

}

if ($lid_count >= $count_limit) {
$awarded = summergame_player_award_badge($pid, $badge->bid);
}
}
}
else {
// Collection Badge
$eligible = TRUE;

foreach (explode(',', $badge->formula) as $text_pattern) {
$query = "SELECT lid FROM sg_ledger WHERE pid = :pid AND (";
/*$query = "SELECT lid FROM sg_ledger WHERE pid = :pid AND (";
$args = [
':pid' => $pid
];

];*/

$found_any_match = false;
$text_patterns = explode('|', $text_pattern);
foreach ($text_patterns as $i => &$pattern) {
$args[':type_' . $i] = $pattern;

foreach ($points_rows as $points) {
foreach ($text_patterns as $i => &$pattern) {
/* $args[':type_' . $i] = $pattern;
$args[':metadata_' . $i] = 'gamecode:' . $pattern;
$pattern = "(type LIKE :type_$i OR metadata LIKE :metadata_$i)";
$pattern = "(type LIKE :type_$i OR metadata LIKE :metadata_$i)";*/
$wc_text_pattern = "/" . str_replace("%", ".*", $pattern) . "/";
$wc_gamecode_pattern = "/" . str_replace("%", ".*", "gamecode:".$pattern."$") . "/";
if (preg_match($wc_text_pattern, $points->type) ||
preg_match($wc_gamecode_pattern, $points->metadata)
) {
$found_any_match = true;
}
}
}

if (!$found_any_match) {
$eligible = FALSE;
break;
}
$query .= implode(' OR ', $text_patterns);
//$query .= implode(' OR ', $text_patterns);

$query .= ") AND game_term = :game_term LIMIT 1";
$args[':game_term'] = $game_term;
//$query .= ") AND game_term = :game_term LIMIT 1";
//$args[':game_term'] = $game_term;

$ledger = $db->query($query, $args)->fetchObject();
//$ledger = $db->query($query, $args)->fetchObject();

if (!isset($ledger->lid)) {
/*if (!isset($ledger->lid)) {
$eligible = FALSE;
break;
}
}*/
}
if ($eligible) {
$awarded = summergame_player_award_badge($pid, $badge->bid);
Expand Down