Details

    • Type: Sub-task
    • Status: Closed
    • Priority: Must
    • Resolution: Fixed
    • Affects Version/s: None
    • Fix Version/s: Milestone 3
    • Labels:
    • Complexity:
      Undetermined
    • Sprint:
      Sync 2.0 Sprint 11, Sync 2.0 Sprint 12

      Description

      Once conflict is detected it has to be saved to database for further resolution.

      Class for saving is MergeConflict

      Table "merge_conflict", required fields:

      • full_class_name: string
      • org_local: JSON
      • org_foreign: JSON
      • message: text(255)
      • all fields from BaseOpenmrsData class

      ACC:

      • add service for┬áMergeConflict
      • converts MergeConflictDao to MergeConflict
      • converts MergeConflict to MergeConflictDao
      • add MergeConflict to database

        Gliffy Diagrams

          Attachments

            Attachments-Category-Modification

              Activity

                People

                • Assignee:
                  alalo Arkadiusz Lalo
                  Reporter:
                  rstencel Rafał Stencel
                • Votes:
                  0 Vote for this issue
                  Watchers:
                  2 Start watching this issue

                  Dates

                  • Created:
                    Updated:
                    Resolved:

                    Time Tracking

                    Estimated:
                    Original Estimate - 5 hours Original Estimate - 5 hours
                    5h
                    Remaining:
                    Remaining Estimate - 0 minutes
                    0m
                    Logged:
                    Time Spent - 5 hours, 30 minutes
                    5h 30m