Skip to content

generate different UIDs for Birthday, Anniversary and Death event - #7707

Merged
MorrisJobke merged 1 commit into
masterfrom
bugfix/noid/birthdaycalendar-different-uids
Jan 26, 2018
Merged

generate different UIDs for Birthday, Anniversary and Death event#7707
MorrisJobke merged 1 commit into
masterfrom
bugfix/noid/birthdaycalendar-different-uids

Conversation

@georgehrke

@georgehrkegeorgehrke commented Jan 4, 2018

Copy link
Copy Markdown
Member

fixes#7706

Would like to back port to stable12 and stable13

Signed-off-by: Georg Ehrke <developer@georgehrke.com>
@codecov

codecovBot commented Jan 4, 2018

Copy link
Copy Markdown

Codecov Report

Merging #7707 into master will not change coverage.
The diff coverage is 100%.

@@ Coverage Diff @@## master #7707 +/- ##
=========================================
Coverage 51.18% 51.18% Complexity 24948 24948 =========================================
Files 1605 1605 Lines 94925 94925 Branches 1376 1376 =========================================
Hits 48583 48583 Misses 46342 46342
Impacted FilesCoverage ΔComplexity Δ
apps/dav/lib/CalDAV/BirthdayService.php81.29% <100%> (ø)44 <12> (ø)⬇️

@inducer

Copy link
Copy Markdown

Thanks for working on this!

*/
public function testBuildBirthdayFromContact($expectedSummary, $data) {
$cal = $this->service->buildDateFromContact($data, 'BDAY', '*');
$cal = $this->service->buildDateFromContact($data, 'BDAY', '', '*');

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems more like a hack to test it. :) can you also add a test with the proper postfix :P?

@georgehrke

Copy link
Copy Markdown
MemberAuthor

Let me add more tests, but the actual code will stay unchanged and is ready to be reviewed

@ChristophWurstChristophWurst added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Jan 24, 2018
@MorrisJobke
MorrisJobke merged commit c67736a into masterJan 26, 2018
@MorrisJobke
MorrisJobke deleted the bugfix/noid/birthdaycalendar-different-uids branch January 26, 2018 14:46
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

4. to releaseReady to be released and/or waiting for tests to finish

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Anniversary and birthday events have same ID in birthday calendar

6 participants

@georgehrke@inducer@rullzer@MorrisJobke@juliusknorr@ChristophWurst