Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Jan 26, 2018

Conversation

georgehrke
Copy link
Member

@georgehrke georgehrke commented Jan 4, 2018

fixes #7706

Would like to back port to stable12 and stable13

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

codecov bot commented Jan 4, 2018

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 Files Coverage Δ Complexity Δ
apps/dav/lib/CalDAV/BirthdayService.php 81.29% <100%> (ø) 44 <12> (ø) ⬇️

@inducer
Copy link

inducer commented Jan 4, 2018

Thanks for working on this!

@@ -64,7 +64,7 @@ public function setUp() {
* @param string | null $data
*/
public function testBuildBirthdayFromContact($expectedSummary, $data) {
$cal = $this->service->buildDateFromContact($data, 'BDAY', '*');
$cal = $this->service->buildDateFromContact($data, 'BDAY', '', '*');
Copy link
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
Member Author

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

@ChristophWurst ChristophWurst 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 master Jan 26, 2018
@MorrisJobke MorrisJobke deleted the bugfix/noid/birthdaycalendar-different-uids branch January 26, 2018 14:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
4. to release Ready 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