Skip to content
Snippets Groups Projects
Commit 87ef7a49 authored by efalcy's avatar efalcy
Browse files

Merge branch 'dev#180232_verification_import_total_cafeyn' into 'master'

dev#180232 : Cafeyn full import

See merge request !4752
parents 2fc04d9e a2974a5b
Branches
Tags
1 merge request!4752dev#180232 : Cafeyn full import
Pipeline #23826 passed with stage
in 23 minutes and 43 seconds
- fonctionnalité #180232 : Ressource Numérique: Cafeyn : import total au lieu d'un import incrémentiel
\ No newline at end of file
......@@ -46,6 +46,11 @@ class Cafeyn_Service extends Class_DigitalResource_Service {
}
protected function _deleteNonHarvested() {
return $this->_deleteNonHarvestedAlbums();
}
protected function _parseJson($json) : bool{
if(!$results = json_decode($json))
return false;
......
......@@ -276,7 +276,7 @@ class CafeynDashboardActivatedTest extends CafeynActivatedTestCase {
public function setUp() {
parent::setUp();
$album = $this->fixture('Class_Album',
$album = $this->fixture(Class_Album::class,
['id' => 20,
'titre' => '10 moutons',
'type_doc_id' => 'Cafeyn'
......@@ -322,7 +322,7 @@ class CafeynHarvestDisableUpdateTest extends CafeynServiceTestCase {
public function addFixtures() {
Class_AdminVar::set('Cafeyn_BATCH_UPDATE_NOTICE', '0');
$album = $this->fixture('Class_Album',
$album = $this->fixture(Class_Album::class,
['id' => 20,
'visible' => 1,
'status' => 3,
......@@ -355,12 +355,13 @@ class CafeynHarvestDisableUpdateTest extends CafeynServiceTestCase {
class CafeynHarvestUpdateTest extends CafeynServiceTestCase {
public function setUp() {
parent::setUp();
Class_Album::find(20)->index();
}
public function addFixtures() {
$album = $this->fixture('Class_Album',
$album = $this->fixture(Class_Album::class,
['id' => 20,
'titre' => '10 moutons',
'visible' => 1,
......@@ -369,6 +370,16 @@ class CafeynHarvestUpdateTest extends CafeynServiceTestCase {
'url_origine' => 'https://cafeyn.co/',
'type_doc_id' => 'Cafeyn'
]);
$this->fixture(Class_Album::class,
['id' => 25,
'titre' => 'should be deleted',
'visible' => 1,
'status' => 3,
'id_origine' => '666:7',
'url_origine' => 'https://cafeyn.co/',
'type_doc_id' => 'Cafeyn'
]);
return $this;
}
......@@ -392,4 +403,10 @@ class CafeynHarvestUpdateTest extends CafeynServiceTestCase {
$this->assertEquals( '2023-04-03 00:00:00',
Class_Album::find(20)->getNotice()->getDateCreation());
}
/** @test */
public function albumNotInJsonShouldBeDeleted() {
$this->assertNull(Class_Album::find(25));
}
}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment