Skip to content

Commit ba180c3

Browse files
authored
Merge pull request #445 from cultuurnet/PPF-726-dont-create-users
PPF-726 don't create users on UiTIDv1
2 parents bede262 + 8358fad commit ba180c3

File tree

2 files changed

+0
-100
lines changed

2 files changed

+0
-100
lines changed

src/Project/CommandHandler/CreateProjectCommandHandler.php

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -159,50 +159,19 @@ public function handle(CreateProject $createProject)
159159
$this->logger->debug('Finished handling CreateProject for ' . $createProject->getName());
160160
}
161161

162-
/**
163-
* Create a user on test if that user does not exist yet.
164-
*/
165-
private function createTestUser($nick, $email)
166-
{
167-
$searchQuery = new \CultureFeed_SearchUsersQuery();
168-
$searchQuery->mbox = $email;
169-
$searchQuery->mboxIncludePrivate = true;
170-
/** @var \CultureFeed_ResultSet $result */
171-
$result = $this->cultureFeedTest->searchUsers($searchQuery);
172-
173-
// The user already exists?
174-
if ($result->total > 0) {
175-
return $result->objects[0]->id;
176-
}
177-
178-
$user = new \CultureFeed_User();
179-
$user->mbox = $email;
180-
$user->nick = $nick;
181-
$user->password = $this->generatePassword();
182-
$user->status = \CultureFeed_User::STATUS_PRIVATE;
183-
184-
return $this->cultureFeedTest->createUser($user);
185-
}
186-
187162
/**
188163
* Create the test consumer, and add the user as admin.
189164
* @param CreateProject $createProject
190165
*/
191166
private function createTestConsumer(CreateProject $createProject, IntegrationType $integrationType)
192167
{
193-
// Make sure the user also exists on test.
194-
$uid = $this->createTestUser($this->user->getUsername(), $this->user->mbox);
195-
196168
// Create test consumer.
197169
$createConsumer = new \CultureFeed_Consumer();
198170
$createConsumer->name = $createProject->getName();
199171
$createConsumer->description = $createProject->getDescription();
200172
$createConsumer->group = $integrationType->getUitIdPermissionGroups();
201173
$cultureFeedConsumer = $this->cultureFeedTest->createServiceConsumer($createConsumer);
202174

203-
// Add the user as service consumer admin.
204-
$this->cultureFeedTest->addServiceConsumerAdmin($cultureFeedConsumer->consumerKey, $uid);
205-
206175
// Add uitpas permission to consumer
207176
$this->cultureFeedTest->addUitpasPermission($cultureFeedConsumer, $integrationType->getUitPasPermissionGroups());
208177

test/Project/CommandHandler/CreateProjectCommandHandlerTest.php

Lines changed: 0 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -153,12 +153,6 @@ private function setupHandleTest($uid)
153153
->with($cultureFeedConsumer)
154154
->willReturn($culturefeedTestconsumer);
155155

156-
// It should add user as admin.
157-
$this->cultureFeedTest
158-
->expects($this->once())
159-
->method('addServiceConsumerAdmin')
160-
->with($culturefeedTestconsumer->consumerKey, $uid);
161-
162156
// It should create a live consumer.
163157
$this->cultureFeed
164158
->expects($this->once())
@@ -211,69 +205,6 @@ public function testHandle()
211205

212206
$this->setupHandleTest('testuserid');
213207

214-
// It should search for a user on test.
215-
$searchQuery = new \CultureFeed_SearchUsersQuery();
216-
$searchQuery->mbox = 'test@test.be';
217-
$searchQuery->mboxIncludePrivate = true;
218-
$result = new \CultureFeed_ResultSet();
219-
$result->total = 0;
220-
$this->cultureFeedTest
221-
->expects($this->once())
222-
->method('searchUsers')
223-
->with($searchQuery)
224-
->willReturn($result);
225-
226-
// It should add a new test user.
227-
$this->commandHandler
228-
->expects($this->once())
229-
->method('generatePassword')
230-
->willReturn('password');
231-
232-
$newUser = new \CultureFeed_User();
233-
$newUser->mbox = 'test@test.be';
234-
$newUser->nick = 'test';
235-
$newUser->password = 'password';
236-
$newUser->status = \CultureFeed_User::STATUS_PRIVATE;
237-
$this->cultureFeedTest
238-
->expects($this->once())
239-
->method('createUser')
240-
->with($newUser)
241-
->willReturn('testuserid');
242-
243-
$createProject = new CreateProject('Project name', 'Project description', 123, 'coupon');
244-
$this->commandHandler->handle($createProject);
245-
}
246-
247-
/**
248-
* Test the command handler when test user does not exist yet.
249-
*/
250-
public function testHandleNewTestUser()
251-
{
252-
253-
$this->setupHandleTest(20);
254-
255-
$searchQuery = new \CultureFeed_SearchUsersQuery();
256-
$searchQuery->mbox = 'test@test.be';
257-
$searchQuery->mboxIncludePrivate = true;
258-
$result = new \CultureFeed_ResultSet();
259-
$user = new \stdClass();
260-
$user->id = '20';
261-
$result->total = 1;
262-
$result->objects = [
263-
$user,
264-
];
265-
266-
// It should find a user and never create a user.
267-
$this->cultureFeedTest
268-
->expects($this->once())
269-
->method('searchUsers')
270-
->with($searchQuery)
271-
->willReturn($result);
272-
273-
$this->cultureFeedTest
274-
->expects($this->never())
275-
->method('createUser');
276-
277208
$createProject = new CreateProject('Project name', 'Project description', 123, 'coupon');
278209
$this->commandHandler->handle($createProject);
279210
}

0 commit comments

Comments
 (0)