pepepper/tissue
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add test

Browse Source
This commit is contained in:
shibafu 2020-05-23 15:56:51 +09:00
parent 5af55fa6b4
commit cc0e0271b8
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Services/CheckinCsvImporter.php
View File

@ -59,7 +59,7 @@ class CheckinCsvImporter
$imported = 0; $imported = 0;
foreach ($csv->getRecords() as $offset => $record) { foreach ($csv->getRecords() as $offset => $record) {
$line = $offset + 1; $line = $offset + 1;
if (self::IMPORT_LIMIT < $alreadyImportedCount + $imported) { if (self::IMPORT_LIMIT <= $alreadyImportedCount + $imported) {
$limit = self::IMPORT_LIMIT; $limit = self::IMPORT_LIMIT;
$errors[] = "{$line} 行 : インポート機能で取り込めるデータは{$limit}件までに制限されています。これ以上取り込みできません。"; $errors[] = "{$line} 行 : インポート機能で取り込めるデータは{$limit}件までに制限されています。これ以上取り込みできません。";
throw new CsvImportException(...$errors); throw new CsvImportException(...$errors);

15
tests/Unit/Services/CheckinCsvImporterTest.php
View File

@ -291,4 +291,19 @@ class CheckinCsvImporterTest extends TestCase
$importer = new CheckinCsvImporter($user, __DIR__ . '/../../fixture/Csv/date.utf8.csv'); $importer = new CheckinCsvImporter($user, __DIR__ . '/../../fixture/Csv/date.utf8.csv');
$importer->execute(); $importer->execute();
} }
public function testRecordLimit()
{
$user = factory(User::class)->create();
factory(Ejaculation::class, 5000)->create([
'user_id' => $user->id,
'source' => Ejaculation::SOURCE_CSV
]);
$this->expectException(CsvImportException::class);
$this->expectExceptionMessage('2 行 : インポート機能で取り込めるデータは5000件までに制限されています。これ以上取り込みできません。');
$importer = new CheckinCsvImporter($user, __DIR__ . '/../../fixture/Csv/link.utf8.csv');
$importer->execute();
}
} }