demostf/api
1
0
Fork 0
mirror of https://codeberg.org/demostf/api.git synced 2026-06-03 09:54:17 +02:00
Code Issues Releases Wiki Activity

ensure chat is sorted

Browse source
This commit is contained in:
Robin Appelman 2020-11-28 02:08:41 +01:00
commit dddf5933d2
4 changed files with 39 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
NginxTestDockerfile Normal file
View file

@ -0,0 +1,3 @@
FROM nginx
ADD nginx_test.conf /etc/nginx/conf.d/api.conf

31
nginx_test.conf Normal file
View file

@ -0,0 +1,31 @@
server {
listen 80;
server_name localhost;
root /usr/share/nginx/html;
client_max_body_size 200m;
if ($request_method = POST ) {
rewrite /upload /do_upload last;
break;
}
location /do_upload {
fastcgi_pass api:9000;
fastcgi_index index.php;
include fastcgi_params;
fastcgi_param SCRIPT_FILENAME /app/src/public/upload.php;
}
index index.php;
try_files $uri /index.php?$query_string /index.php;
location ~ ^(.+?\.php)(/.*)?$ {
fastcgi_param PATH_INFO $2;
fastcgi_pass api:9000;
fastcgi_index index.php;
fastcgi_param SCRIPT_FILENAME /app/src/public/index.php;
include fastcgi_params;
}
}

3
src/Providers/ChatProvider.php
View file

@ -12,7 +12,8 @@ class ChatProvider extends BaseProvider {
$query = $this->getQueryBuilder(); $query = $this->getQueryBuilder();
$query->select('text', '"from"', 'time') $query->select('text', '"from"', 'time')
->from('chat') ->from('chat')
->where($query->expr()->eq('demo_id', $query->createNamedParameter($demoId, PDO::PARAM_INT))); ->where($query->expr()->eq('demo_id', $query->createNamedParameter($demoId, PDO::PARAM_INT)))
->orderBy('time', 'ASC');
$result = $query->execute(); $result = $query->execute();

7
test/Providers/ChatProviderTest.php
View file

@ -24,7 +24,7 @@ class ChatProviderTest extends TestCase {
public function testStoreRetrieve() { public function testStoreRetrieve() {
$message1 = new ChatMessage('foo', 2, 'bar'); $message1 = new ChatMessage('foo', 2, 'bar');
$message2 = new ChatMessage('foo2', 2, 'bar2'); $message2 = new ChatMessage('foo2', 1, 'bar2');
$message3 = new ChatMessage('foo2', 2, 'bar2'); $message3 = new ChatMessage('foo2', 2, 'bar2');
$this->provider->storeChatMessage(1, $message1); $this->provider->storeChatMessage(1, $message1);
@ -32,10 +32,9 @@ class ChatProviderTest extends TestCase {
$this->provider->storeChatMessage(2, $message3); $this->provider->storeChatMessage(2, $message3);
$result = $this->provider->getChat(1); $result = $this->provider->getChat(1);
sort($result);
$this->assertCount(2, $result); $this->assertCount(2, $result);
$this->assertEquals($message1, $result[0]); $this->assertEquals($message2, $result[0]);
$this->assertEquals($message2, $result[1]); $this->assertEquals($message1, $result[1]);
} }
} }