Skip to content

Commit 453fbad

Browse files
author
LDFOUR\luisd
committed
Merge branch 'develop' into feature/WN-252
2 parents d637810 + fc44782 commit 453fbad

9 files changed

Lines changed: 215 additions & 8 deletions

File tree

‎.github/workflows/main.yml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
1-
on: [push]
1+
on:
2+
pull_request:
3+
types:
4+
- closed
5+
branches:
6+
- 'develop'
7+
28
name: Linux_Container_Workflow
39
jobs:
410
build-and-deploy:

‎app/Classes/Repositories/ApplicationRepository.php‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,11 @@ public function allDesc($columns = ['*'])
4242
return $this->applicationModel->orderBy('id', 'desc')->get($columns);
4343
}
4444

45+
public function findIn($ids = [], $columns = ['*'])
46+
{
47+
return $this->applicationModel->whereIn('id', $ids)->get($columns);
48+
}
49+
4550
/**
4651
* @param array $attributes
4752
* @return Application

‎app/Classes/Repositories/ApplicationRepositoryInterface.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,6 @@ interface ApplicationRepositoryInterface extends RepositoryInterface
1414
public function findForUserId($tenantId, $userId);
1515

1616
public function allDesc($columns);
17+
18+
public function findIn($ids = [], $columns = ['*']);
1719
}

‎app/Http/Controllers/RouteController.php‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<?php
2+
3+
namespace App\Http\Controllers;
4+
5+
use Illuminate\Support\Facades\Route;
6+
7+
class RouteController extends Controller
8+
{
9+
public function index()
10+
{
11+
$routes = collect(Route::getRoutes())->filter(function ($route) {
12+
return strpos($route->getActionName(), 'App\Http\Controllers') !== false;
13+
})->map(function ($route) {
14+
return [
15+
'url' => $route->uri(),
16+
'name' => $route->getName(),
17+
'action' => $route->getActionName(),
18+
'method' => $route->methods()[0], // Get the first HTTP method for the route
19+
'middleware' => $route->middleware(),
20+
];
21+
});
22+
23+
return view('endpoints', [
24+
'routeData' => $routes,
25+
]);
26+
}
27+
}

‎app/Http/Controllers/UsageLogController.php‎

Lines changed: 33 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
use Illuminate\Support\Facades\Cache;
99
use Illuminate\Support\Facades\Log;
1010
use League\Fractal\Manager;
11+
use App\Models\UsageLog;
1112

1213
class UsageLogController extends Controller
1314
{
@@ -203,28 +204,53 @@ public function getForApplication(int $applicationId)
203204
/**
204205
* @return \Symfony\Component\HttpFoundation\Response
205206
*/
206-
public function getTotals()
207+
public function getTotals(Request $request)
207208
{
209+
$this->validate($request, [
210+
'society' => 'sometimes|string',
211+
'region' => 'sometimes|int',
212+
'hazard' => 'sometimes|string',
213+
'date' => 'sometimes|date',
214+
'language' => 'sometimes|string',
215+
]);
208216
try {
209217
// Cache to be enabled in production
210-
//$totals = Cache::remember('usage.totals', 3600 * 24, function () {
211-
$applications = $this->applicationRepo->all();
212-
$usageLogs = $this->usageLogRepo->all();
218+
$usageLog = new UsageLog;
219+
$query = $usageLog->query();
220+
221+
if (isset($request->society)) {
222+
$query->where('endpoint', 'v1/org/'.$request->society.'/whatnow');
223+
}
224+
if (isset($request->region)) {
225+
$query->where('region', $request->region);
226+
}
227+
if (isset($request->hazard)) {
228+
$query->where('event_type', 'like', '%' . $request->hazard . '%');
229+
}
230+
if (isset($request->date)) {
231+
$query->whereDate('timestamp', $request->date);
232+
}
233+
if (isset($request->language)) {
234+
$query->where('language', $request->language);
235+
}
236+
$usageLogs = $query->get();
237+
238+
$uniqueApplicationIds = $usageLogs->pluck('application_id')->unique();
239+
240+
$applications = $this->applicationRepo->findIn($uniqueApplicationIds->toArray());
213241

214242
// Calculate total estimated users
215243
$totalEstimatedUsers = $applications->map(function ($application) {
216244
return $application->estimated_users_count;
217245
})->sum();
218246

219247
$totals = [
220-
'applications' => count($applications),
248+
'applications' => count($uniqueApplicationIds),
221249
'estimatedUsers' => $totalEstimatedUsers,
222250
'hits' => count($usageLogs),
223251
];
224-
//});
225252
} catch (\Exception $e) {
226253
Log::error('Could not get Usage Log totals', ['message' => $e->getMessage()]);
227-
228254
return response()->json([
229255
'status' => 500,
230256
'error_message' => 'Could not get Usage Log totals',

‎database/migrations/2023_01_23_155432_create_usage_logs_table.php‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,9 @@ public function up()
2121
$table->timestamp('timestamp');
2222
});
2323
}
24+
25+
public function down()
26+
{
27+
Schema::dropIfExists('usage_logs');
28+
}
2429
}

‎helm-chart/templates/deployment.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ spec:
1111
app: {{ .Chart.Name }}
1212
template:
1313
metadata:
14+
annotations:
15+
releaseTime: {{ now | date "2006-01-02 15:04:05Z07:00" | quote }}
1416
labels:
1517
app: {{ .Chart.Name }}
1618
spec:

‎resources/views/endpoints.blade.php‎

Lines changed: 131 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,131 @@
1+
<!DOCTYPE html>
2+
<html lang="en">
3+
<head>
4+
<meta charset="UTF-8">
5+
<meta name="viewport" content="width=device-width, initial-scale=1.0">
6+
<title>API Endpoints</title>
7+
<style>
8+
/* General styling for dark theme */
9+
body {
10+
background-color: #121212;
11+
color: #e0e0e0;
12+
font-family: Arial, sans-serif;
13+
margin: 0;
14+
padding: 0;
15+
}
16+
.container {
17+
max-width: 800px;
18+
margin: 0 auto;
19+
padding: 20px;
20+
}
21+
22+
/* Search box styling */
23+
.search-container {
24+
margin-bottom: 20px;
25+
}
26+
.search-input {
27+
width: 100%;
28+
padding: 10px;
29+
font-size: 16px;
30+
background-color: #1e1e1e;
31+
color: #e0e0e0;
32+
border: 1px solid #333;
33+
border-radius: 4px;
34+
}
35+
36+
/* Card styling */
37+
.card {
38+
background-color: #1e1e1e;
39+
border: 1px solid #333;
40+
border-radius: 8px;
41+
padding: 20px;
42+
}
43+
.card-header {
44+
font-size: 22px;
45+
font-weight: bold;
46+
color: #ffffff;
47+
margin-bottom: 15px;
48+
}
49+
50+
/* Endpoint list styling */
51+
.endpoint-list {
52+
list-style-type: none;
53+
padding: 0;
54+
margin: 0;
55+
}
56+
.endpoint-item {
57+
border-bottom: 1px solid #333;
58+
padding: 10px 0;
59+
}
60+
.endpoint-info {
61+
display: flex;
62+
align-items: center;
63+
margin-bottom: 5px;
64+
}
65+
66+
/* Method badge styles */
67+
.endpoint-method {
68+
padding: 6px 10px;
69+
border-radius: 4px;
70+
font-weight: bold;
71+
color: #ffffff;
72+
margin-right: 10px;
73+
text-transform: uppercase;
74+
}
75+
.get { background-color: #4caf50; }
76+
.post { background-color: #2196f3; }
77+
.put { background-color: #ff9800; }
78+
.delete { background-color: #f44336; }
79+
80+
81+
/* URL and description styles */
82+
.endpoint-url {
83+
font-weight: bold;
84+
color: #e0e0e0;
85+
}
86+
.endpoint-description {
87+
color: #b0b0b0;
88+
}
89+
</style>
90+
</head>
91+
<body>
92+
<div class="container">
93+
<div class="search-container">
94+
<input type="text" class="search-input" placeholder="Search endpoints..." />
95+
</div>
96+
97+
<div class="card">
98+
<div class="card-header">API Endpoints</div>
99+
<ul class="endpoint-list">
100+
@foreach ($routeData as $route)
101+
<li class="endpoint-item">
102+
<div class="endpoint-info">
103+
<div class="endpoint-method {{ strtolower($route['method']) }}">{{ $route['method'] }}</div>
104+
<div class="endpoint-url">{{ $route['url'] }}</div>
105+
</div>
106+
<div class="endpoint-description">{{ $route['name'] }} - {{ $route['action'] }}</div>
107+
</li>
108+
@endforeach
109+
</ul>
110+
</div>
111+
</div>
112+
113+
<script>
114+
const searchInput = document.querySelector('.search-input');
115+
const endpointItems = document.querySelectorAll('.endpoint-item');
116+
117+
searchInput.addEventListener('input', () => {
118+
const searchTerm = searchInput.value.toLowerCase();
119+
endpointItems.forEach(item => {
120+
const url = item.querySelector('.endpoint-url').textContent.toLowerCase();
121+
const description = item.querySelector('.endpoint-description').textContent.toLowerCase();
122+
if (url.includes(searchTerm) || description.includes(searchTerm)) {
123+
item.style.display = 'block';
124+
} else {
125+
item.style.display = 'none';
126+
}
127+
});
128+
});
129+
</script>
130+
</body>
131+
</html>

‎routes/web.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,6 @@
1616
Route::get('/', function () {
1717
return redirect()->to('https://whatnow.preparecenter.org');
1818
});
19+
// API documentation
20+
Route::get('/endpoints', [\App\Http\Controllers\RouteController::class, 'index'])
21+
->name('endpoints.index'); // Displays list of available API endpoints with documentation

0 commit comments

Comments
 (0)