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.

Sign up for GitHub

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

Jump to bottom

Create api for EAP create, update, get #1480

Draft
wants to merge 13 commits into
base: develop
Choose a base branch
from
Draft

Create api for EAP create, update, get #1480

wants to merge 13 commits into from

Conversation

Rup-Narayan-Rajbanshi
Copy link
Collaborator

@Rup-Narayan-Rajbanshi Rup-Narayan-Rajbanshi commented Jul 13, 2022 •
edited
Loading

Addresses EAP

Changes

  • Modified models

  • Added serializers

  • Added api for create , update and get for eap form.

  • Added test cases, factories

  • Added Models for EAP activation

  • Modified api for (create, update, get) field-report to accept EAP activation.

  • Modified existing test case of field-report to accept EAP Activation.

  • Added Models for EAP Final Report

  • Added Api for EAP Final Report

  • Added Test case for EAP Final Report

  • Updated/ran unit tests

  • Updated CHANGELOG.md

Release

If there is a version update, make sure to tag the repository with the latest version.

@szabozoltan69
Copy link
Contributor

@thenav56 Please do the merge yourself when needed. I have a feeling that it is not so easy to remove an already-done migration step, but I may be wrong about that.

@thenav56
Copy link
Member

@thenav56 Please do the merge yourself when needed. I have a feeling that it is not so easy to remove an already-done migration step, but I may be wrong about that.

This was a mistake. @Rup-Narayan-Rajbanshi will create newer migrations instead of modifying the old one.

@Rup-Narayan-Rajbanshi Rup-Narayan-Rajbanshi force-pushed the feature/eap-create-update-get branch from b55eedb to b5c3981 Compare July 14, 2022 08:07
@Rup-Narayan-Rajbanshi
Copy link
Collaborator Author

@thenav56 Please do the merge yourself when needed. I have a feeling that it is not so easy to remove an already-done migration step, but I may be wrong about that.

@szabozoltan69 , sorry it was a mistake, Now there is a new migration file.

@szabozoltan69
Copy link
Contributor

Please avoid using enumfields: https://github.com/IFRCGo/go-api/blob/feature/eap-create-update-get/eap/serializers.py#L5
In Django 3.2 there is no such module, and will be conflicted when we bump up to Django 3.2 soon.

@Rup-Narayan-Rajbanshi Rup-Narayan-Rajbanshi changed the title Crate api for eap create, update, get Create api for eap create, update, get Jul 21, 2022
@Rup-Narayan-Rajbanshi Rup-Narayan-Rajbanshi changed the title Create api for eap create, update, get Create api for EAP create, update, get Jul 21, 2022
@Rup-Narayan-Rajbanshi Rup-Narayan-Rajbanshi force-pushed the feature/eap-create-update-get branch 5 times, most recently from e65b45e to 8e92079 Compare August 4, 2022 05:19
@szabozoltan69
Copy link
Contributor

Dear @Rup-Narayan-Rajbanshi , @frozenhelium – could we please merge this PR to develop? Even if not ready fully?
There are some EAP changes already in develop, and without these last changes I can not merge develop to my Django 3.2 branch (due to the above mentioned enum issue, which is solved since then in this branch).

@Rup-Narayan-Rajbanshi
Copy link
Collaborator Author

Dear @Rup-Narayan-Rajbanshi , @frozenhelium – could we please merge this PR to develop? Even if not ready fully? There are some EAP changes already in develop, and without these last changes I can not merge develop to my Django 3.2 branch (due to the above mentioned enum issue, which is solved since then in this branch).

It is not reviewd so I won't recommend you to merge into develop. Regarding the above mentioned enum issue I will pull the develop branch , solve the above enum issue and then push it and then you can merge it into develop. @szabozoltan69

@szabozoltan69
Copy link
Contributor

It is not super urgent. Take your time, even maybe the review step is ok for me.

@Rup-Narayan-Rajbanshi Rup-Narayan-Rajbanshi force-pushed the feature/eap-create-update-get branch from 8e92079 to 4909a62 Compare September 13, 2022 09:27
@Rup-Narayan-Rajbanshi
Crate api for eap create, update, get
4981e11 
- Modified models
- Added serializers
- Added views
- Added test cases, factories
@Rup-Narayan-Rajbanshi
Add api for eap options
a5598bf 
- removed api for indicator, status
- created a model for prioritized_risk for early actions
- modified test cases to accept many prioritized risks
@Rup-Narayan-Rajbanshi
Modified create, update, get of field report api to accept eap activa…
fe19092 
…tion:
@Rup-Narayan-Rajbanshi
Modified test case for field report to check EAP Activation Data
4b3f013 
- Solve issue for empty document for eap activation create and update
@Rup-Narayan-Rajbanshi
Add new choice field EAP Activation in field report model
ca4ab7a
@Rup-Narayan-Rajbanshi
Add models for EAP Activation Report
21855a8
@Rup-Narayan-Rajbanshi
Added create, update, get api for EAP final report
7122f27
@Rup-Narayan-Rajbanshi
Add test case for EAP final report
58591ee
@Rup-Narayan-Rajbanshi
Fix error for districs_details, indicator_display, document_details for
135cfdd 
EAP
@Rup-Narayan-Rajbanshi Rup-Narayan-Rajbanshi force-pushed the feature/eap-create-update-get branch from 4909a62 to 74367b7 Compare September 13, 2022 09:28
@szabozoltan69
Copy link
Contributor

Is this branch still needed?

@Rup-Narayan-Rajbanshi
Copy link
Collaborator Author

@szabozoltan69 ,Let it be in Draft.

@szabozoltan69 szabozoltan69 force-pushed the develop branch 4 times, most recently from 17d0645 to a8b22d7 Compare July 22, 2024 16:28
@szabozoltan69 szabozoltan69 force-pushed the develop branch 2 times, most recently from 14cb672 to 682a280 Compare October 8, 2024 12:54
@tnagorra
Copy link
Member

tnagorra commented Oct 18, 2024 •
edited
Loading

@Rup-Narayan-Rajbanshi @thenav56 Can we close this PR?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@thenav56 thenav56 Awaiting requested review from thenav56

@k9845 k9845 Awaiting requested review from k9845

Assignees

@thenav56 thenav56

@k9845 k9845

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@Rup-Narayan-Rajbanshi @szabozoltan69 @thenav56 @tnagorra @k9845