Skip to content

Commit

Permalink
Necheporenko/Add a rejection message (#445)
Browse files Browse the repository at this point in the history
* Necheporenko/Added a rejection message after the status is changed to rejected

* Necheporenko/Added a rejection message after the status is changed to rejected

* Code review and small fixes

* Change URL reading for determination if it is provider registration (#443)

Co-authored-by: Sergii Novytskyi <[email protected]>

* Fixed phone regex constant for RegisterViewModel (#449)

* add dev container for UI team (#448)

* add dev container for UI team

* remove outdated MSSQL

* Styles of Registration and SignIn pages have been fixed. (#450)

* Added changes to status check and rejection messages

* Added tests for workshopService. Create, GetById, GetbyProviderId, GetAll, Update is covered by tests (#451)

* Changed the data output for feature flags (#452)

* Changed the data output for feature flags

* Applied changes to FeatureManagement

* add parameter "providerRegistration" to the link on registration form (#460)

Co-authored-by: Sergii Novytskyi <[email protected]>

* Provicevko/ Upload/Get workshop images (#440)

* Initial realization

* Renamed main classes

Added method for upload many images. Created Validate method for images. Changed names with "picture" -> "image".

Added resources

Added connecting files with errors

Changed file collection, indexing

Added logging for ImageService, ImageValidatorService.

Added XML documentation

Incuded ImageIds for getting Workshop by Id

Fixed image width/height validation

Added 413 description in WorkshopController/Create

* Deleted migrations

* reorder imports

* Chenged getting, uploading images in ImageServcie

* Fixed names. Changed Image<T> model, remove imageMetadata. Changed image services for returning externalImageIds without imageMetadata

* Fixed p.1. Added MultipleKeyValueOperationResult. Changed UploadManyWorkshopImagesWithUpdatingEntityAsync().

* Added WorkshopController v2.0

Co-authored-by: Dmytro M <[email protected]>

* add mongo config for CD (#461)

* Added ApprovedTime of the application

* Fix null reference while doing count validation (#464)

* Added ApprovedTime of the application

* add retries to MySql connection

* Fixed model binding for nested types in multipart/form-data (#468)

* Fixed RetryException (#469)

* Novitsky/information about portal (#462)

* Add models, controllers and services for "About Portal" information

* Add models, controllers and services for "About Portal" information

* Make a migration

* fix update

Co-authored-by: Sergii Novytskyi <[email protected]>

* add image processing library (#470)

* Fixed including workshopImages (#471)

* Refactor/google logging (#472)

* refactor logging

* update min level

* remove default logging config

* add debug mode for elastic

* add exception to error logs

* add error results

* fix log to string

* add to string for operation error

* test debug

* fixed settings

* update builder to full

* add debug sink

* Novitsky/backup for elasticsearch (#260)

* Add first implementation with hard code for backup synchronization workshops

* Add controller

* Add create operation

* Add first example of implementation

* Use one query to database for one type of operation

* delete migrations for correct rebase

* rebase backup for elasticsearch onto develop

* rename backuptracker to elasticsearchSynchronizationRecord

* change logic for getting workshops

* worked model for update

* Implement bulk synchronization for create and update

* delete migration

* Add delete operation

* Update controller

* Add operation for delete all records

* Add exception and logging

* Add logs

* Delete migration

* Rebase on develop

* fix mapping

* remove migration

* Add migration after rebase

* uncomment authorization

* Change models

* Change migration according to new model

* Change logic for tracking

* Rewrite queries

* fix converting sourceDto to ESModel

* code refactoring

* Add scheduler for synchronization

* Fix scheduler

* delete migration

* fix after rebase

* fix after rebase

* fix issues

* fix issues after rebase

* restore previous implementation

* Add repository for ElasticsearchSyncRecord

* optimize elasticsearch synchronization

* code refactoring

* change mapper for ElasticsearchSyncRecord

* Remove unnecessary mapping

* Remove unnecessary mapping

* delete migration before merge branches

* add migration

* configure mappings

Co-authored-by: Sergii Novytskyi <[email protected]>

* Added test for GetByFilter and Delete methods (#466)

* Tatokhin/Unit tests + refactored controllers and services(Provider, InstitutionStatus, PermissionsForRole)  (#447)

* provider controller response fixed, tests for controller edited

* used helper methods for assertion

* controller delete method edited to catch exceptions, updated tests for it

* provider controller and tests fixes

* updated controller, addet test for getall action case, fixed test names

* deleted unnecessary consts in tests

* refactored provider service update action, fixed related files (controller, generator, tests)

* refactored provider service, updated related controller actions, added requested changes for tests

* added tests to examine provider controller update method, refactored controller logic for better communication

* added tests to examine value stored in get all and get by id actions result

* added methods to clone providers to assert collections by each object fields values

* temporary method to clone provider in test helper

* updated controller tests to use mapping extensions instead of additional method

* generic test helpers, unit tests refactoring, minor changes in controllers

* institutionstatus and permissionsforrole services tests improved

* repaired failed tests, refactored code to return proper data - tupple instead anonymous type

* new helper methods for faking data to use instead literals in tests

* changed method to get expected result

* created user fake user generator, updated provider service tests to avoid hardcoded user creation

* added new features to generate objects and related values with randomizers instead of literals

* refactoring and updates to use randomizers instead literals

* replaced hard-coded objects in permissionsforroles controller tests  with auto-generated entities

* updated tests with randomizers

* updated generator and used it for testing institution status controller and service

* Necheporenko/Added a rejection message after the status is changed to rejected

* Necheporenko/Added a rejection message after the status is changed to rejected

* Code review and small fixes

* Added changes to status check and rejection messages

* Added ApprovedTime of the application

Co-authored-by: Sergey Novitsky <[email protected]>
Co-authored-by: Sergii Novytskyi <[email protected]>
Co-authored-by: Dmytro Minochkin <[email protected]>
Co-authored-by: Grygorii Makieiev <[email protected]>
Co-authored-by: Viktor Tkachenko <[email protected]>
Co-authored-by: provicevko <[email protected]>
Co-authored-by: Olexandr Tatokhin <[email protected]>
  • Loading branch information
8 people authored Dec 29, 2021
1 parent d955331 commit f062953
Show file tree
Hide file tree
Showing 11 changed files with 2,773 additions and 13 deletions.
2 changes: 2 additions & 0 deletions OutOfSchool/OutOfSchool.DataAccess/Enums/ApplicationStatus.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ public enum ApplicationStatus
Pending = 1,
AcceptedForSelection,
Approved,
StudyingForYears,
Completed,
Rejected,
Left,
}
Expand Down
7 changes: 6 additions & 1 deletion OutOfSchool/OutOfSchool.DataAccess/Models/Application.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using System;

using System.ComponentModel.DataAnnotations;
using OutOfSchool.Services.Enums;

namespace OutOfSchool.Services.Models
Expand All @@ -10,8 +10,13 @@ public class Application

public ApplicationStatus Status { get; set; }

[MaxLength(500)]
public string RejectionMessage { get; set; }

public DateTimeOffset CreationTime { get; set; }

public DateTimeOffset? ApprovedTime { get; set; }

public Guid WorkshopId { get; set; }

public Guid ChildId { get; set; }
Expand Down
Loading

0 comments on commit f062953

Please sign in to comment.